RESOLVED FIXED250468
[git-webkit] Resolve multiple cherry-picks 
https://bugs.webkit.org/show_bug.cgi?id=250468
Summary [git-webkit] Resolve multiple cherry-picks
Jonathan Bedard
Reported 2023-01-11 11:41:17 PST
If someone attempts to cherry-pick a change which is itself a cherry-pick, by default, we should cherry-pick the original change instead of creating a double cherry-pick. There are some rare circumstances where the cherry-pick may contain conflict resolution and be more appropriate, but in those cases, the user can specify '--no-resolve' to get a double cherry-pick.
Attachments
Add attachment proposed patch, testcase, etc.
Radar WebKit Bug Importer
Comment 1 2023-01-11 11:41:35 PST
<rdar://problem/104132930>
Jonathan Bedard
Comment 2 2023-01-11 11:43:54 PST
Pull request: https://github.com/WebKit/WebKit/pull/8532
EWS
Comment 3 2023-01-12 08:52:35 PST
Committed 258833@main (753968168a4b): <https://commits.webkit.org/258833@main> Reviewed commits have been landed. Closing PR #8532 and removing active labels.
Note You need to log in before you can comment on or make changes to this bug.