Bug 260876

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

Description Jonathan Bedard 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.

Comment 1 Radar WebKit Bug Importer 2023-08-29 13:49:20 PDT

<rdar://problem/114656645>

Comment 2 Jonathan Bedard 2024-03-13 09:56:13 PDT

The addition of `--use-original` improves this situation, so this isn't a high priority.