Bug 260876

Summary: [git-webkit] Re-use merge resolution from specified branch
Product: WebKit Reporter: Jonathan Bedard <jbedard>
Component: Tools / TestsAssignee: Nobody <webkit-unassigned>
Status: NEW    
Severity: Normal CC: webkit-bug-importer
Priority: P2 Keywords: InRadar
Version: Safari Technology Preview   
Hardware: Unspecified   
OS: Unspecified   

Jonathan Bedard
Reported 2023-08-29 13:49:05 PDT
When we are cherry-picking changes, we always prefer to cherry-pick the original change. This is better for readability in the repository when the cherry-pick is all completed, but it can be painful during the actual cherry-pick process, where there may be a secondary branch that has resolved some of the same merge-conflicts. `git-webkit cherry-pick` should provide an option to use the merge-conflicts from a specified branch while cherry-picking from the original branch.
Attachments
Radar WebKit Bug Importer
Comment 1 2023-08-29 13:49:20 PDT
Jonathan Bedard
Comment 2 2024-03-13 09:56:13 PDT
The addition of `--use-original` improves this situation, so this isn't a high priority.
Note You need to log in before you can comment on or make changes to this bug.