Bug 238877

Summary:	[Merge-Queue] Use rebase over merge when canonicalizing commit
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
See Also:	https://bugs.webkit.org/show_bug.cgi?id=237368

Description Jonathan Bedard 2022-04-06 10:40:08 PDT

When we run `git pull origin <branch>`, we should add `--rebase` to force a rebase workflow instead of a merge workflow.

Comment 1 Radar WebKit Bug Importer 2022-04-06 10:40:24 PDT

<rdar://problem/91363334>

Comment 2 Jonathan Bedard 2022-04-06 10:49:01 PDT

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

Comment 3 Jonathan Bedard 2022-04-06 13:13:28 PDT

Landed https://commits.webkit.org/249344@main (r292496)