Bug 239752 - Support merging pull requests containing multiple commits
Summary: Support merging pull requests containing multiple commits
Status: NEW
Alias: None
Product: WebKit
Classification: Unclassified
Component: Tools / Tests (show other bugs)
Version: WebKit Nightly Build
Hardware: Unspecified Unspecified
: P2 Normal
Assignee: Nobody
URL:
Keywords: InRadar
Depends on:
Blocks: 239082
  Show dependency tree / graph
 
Reported: 2022-04-25 19:56 PDT by Elliott Williams
Modified: 2022-05-31 11:10 PDT (History)
1 user (show)

See Also:

Attachments
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Elliott Williams 2022-04-25 19:56:50 PDT 
Currently, it seems like we require PR branches to be squashed before merging. I think we should encourage contributors to write PRs with multiple commits by lifting this restriction and instead teaching Merge-Queue to do the squashing. I would expect it to use the PR description to write the squashed commit.
Comment 1 Radar WebKit Bug Importer 2022-05-02 19:57:14 PDT 
<rdar://problem/92648043>
Comment 2 Elliott Williams 2022-05-31 11:10:12 PDT 
Real world example of where a workflow like this is needed: I'm relanding a change along with a fix. I think it's most logical, both for history and my reviewers, to land two commits: one is the automated `git revert` commit which undoes the revert, and the other applies fixes.

Currently, I'm forced to squash them together. As a result, the merged commit doesn't make it clear what was changed.