RESOLVED FIXED246341
[git-webkit] Use correct cherry-pick message after conflict resolution 
https://bugs.webkit.org/show_bug.cgi?id=246341
Summary [git-webkit] Use correct cherry-pick message after conflict resolution
Jonathan Bedard
Reported 2022-10-11 09:02:07 PDT
Resolving conflicts during cherry-picking breaks our commit-message template for cherry-picks. Correct that. This has the added advantage of using our cherry-pick template during most `git cherry-pick` invocations as well.
Attachments
Add attachment proposed patch, testcase, etc.
Radar WebKit Bug Importer
Comment 1 2022-10-11 09:03:07 PDT
<rdar://problem/101035018>
Jonathan Bedard
Comment 2 2022-10-11 09:04:00 PDT
Pull request: https://github.com/WebKit/WebKit/pull/5235
EWS
Comment 3 2022-10-11 13:59:15 PDT
Committed 255401@main (8de977259722): <https://commits.webkit.org/255401@main> Reviewed commits have been landed. Closing PR #5235 and removing active labels.
EWS
Comment 4 2022-10-12 09:26:15 PDT
Committed 252432.563@safari-7614-branch (d80c2b42c1b5): <https://commits.webkit.org/252432.563@safari-7614-branch> Reviewed commits have been landed. Closing PR #115 and removing active labels.
Note You need to log in before you can comment on or make changes to this bug.