Bug 250468

Summary: [git-webkit] Resolve multiple cherry-picks
Product: WebKit Reporter: Jonathan Bedard <jbedard>
Component: Tools / TestsAssignee: Jonathan Bedard <jbedard>
Status: RESOLVED FIXED    
Severity: Normal CC: webkit-bug-importer
Priority: P2 Keywords: InRadar
Version: WebKit Nightly Build   
Hardware: Unspecified   
OS: Unspecified   

Description Jonathan Bedard 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.
Comment 1 Radar WebKit Bug Importer 2023-01-11 11:41:35 PST 
<rdar://problem/104132930>
Comment 2 Jonathan Bedard 2023-01-11 11:43:54 PST 
Pull request: https://github.com/WebKit/WebKit/pull/8532
Comment 3 EWS 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.