<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<!DOCTYPE bugzilla SYSTEM "https://bugs.webkit.org/page.cgi?id=bugzilla.dtd">

<bugzilla version="5.0.4.1"
          urlbase="https://bugs.webkit.org/"
          
          maintainer="admin@webkit.org"
>

    <bug>
          <bug_id>239752</bug_id>
          
          <creation_ts>2022-04-25 19:56:50 -0700</creation_ts>
          <short_desc>Support merging pull requests containing multiple commits</short_desc>
          <delta_ts>2022-05-31 11:10:12 -0700</delta_ts>
          <reporter_accessible>1</reporter_accessible>
          <cclist_accessible>1</cclist_accessible>
          <classification_id>1</classification_id>
          <classification>Unclassified</classification>
          <product>WebKit</product>
          <component>Tools / Tests</component>
          <version>WebKit Nightly Build</version>
          <rep_platform>Unspecified</rep_platform>
          <op_sys>Unspecified</op_sys>
          <bug_status>NEW</bug_status>
          <resolution></resolution>
          
          
          <bug_file_loc></bug_file_loc>
          <status_whiteboard></status_whiteboard>
          <keywords>InRadar</keywords>
          <priority>P2</priority>
          <bug_severity>Normal</bug_severity>
          <target_milestone>---</target_milestone>
          
          <blocked>239082</blocked>
          <everconfirmed>1</everconfirmed>
          <reporter name="Elliott Williams">emw</reporter>
          <assigned_to name="Nobody">webkit-unassigned</assigned_to>
          <cc>webkit-bug-importer</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1864330</commentid>
    <comment_count>0</comment_count>
    <who name="Elliott Williams">emw</who>
    <bug_when>2022-04-25 19:56:50 -0700</bug_when>
    <thetext>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.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1866028</commentid>
    <comment_count>1</comment_count>
    <who name="Radar WebKit Bug Importer">webkit-bug-importer</who>
    <bug_when>2022-05-02 19:57:14 -0700</bug_when>
    <thetext>&lt;rdar://problem/92648043&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1873055</commentid>
    <comment_count>2</comment_count>
    <who name="Elliott Williams">emw</who>
    <bug_when>2022-05-31 11:10:12 -0700</bug_when>
    <thetext>Real world example of where a workflow like this is needed: I&apos;m relanding a change along with a fix. I think it&apos;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&apos;m forced to squash them together. As a result, the merged commit doesn&apos;t make it clear what was changed.</thetext>
  </long_desc>
      
      

    </bug>

</bugzilla>