[Webkit-unassigned] [Bug 260876] New: [git-webkit] Re-use merge resolution from specified branch

[bugzilla-daemon at webkit.org]

https://bugs.webkit.org/show_bug.cgi?id=260876

            Bug ID: 260876
           Summary: [git-webkit] Re-use merge resolution from specified
                    branch
           Product: WebKit
           Version: Safari Technology Preview
          Hardware: Unspecified
                OS: Unspecified
            Status: NEW
          Severity: Normal
          Priority: P2
         Component: Tools / Tests
          Assignee: webkit-unassigned at lists.webkit.org
          Reporter: jbedard at apple.com

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.

-- 
You are receiving this mail because:
You are the assignee for the bug.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.webkit.org/pipermail/webkit-unassigned/attachments/20230829/c7c933a5/attachment.htm>