Bug 250468
| Summary: | [git-webkit] Resolve multiple cherry-picks | ||
|---|---|---|---|
| Product: | WebKit | Reporter: | Jonathan Bedard <jbedard> |
| Component: | Tools / Tests | Assignee: | Jonathan Bedard <jbedard> |
| Status: | RESOLVED FIXED | ||
| Severity: | Normal | CC: | webkit-bug-importer |
| Priority: | P2 | Keywords: | InRadar |
| Version: | WebKit Nightly Build | ||
| Hardware: | Unspecified | ||
| OS: | Unspecified | ||
Jonathan Bedard
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
<rdar://problem/104132930>
Jonathan Bedard
Pull request: https://github.com/WebKit/WebKit/pull/8532
EWS
Committed 258833@main (753968168a4b): <https://commits.webkit.org/258833@main>
Reviewed commits have been landed. Closing PR #8532 and removing active labels.