Bug 246341

Summary:	[git-webkit] Use correct cherry-pick message after conflict resolution
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:	Other
Hardware:	Unspecified
OS:	Unspecified

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

Comment 1 Radar WebKit Bug Importer 2022-10-11 09:03:07 PDT

<rdar://problem/101035018>

Comment 2 Jonathan Bedard 2022-10-11 09:04:00 PDT

Pull request: https://github.com/WebKit/WebKit/pull/5235

Comment 3 EWS 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.

Comment 4 EWS 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.