<story><title>Rebase and merge pull requests</title><url>https://github.com/blog/2243-rebase-and-merge-pull-requests</url></story><parent_chain></parent_chain><comment><author>tomstuart</author><text>This is great, but as chrisseaton asked on Twitter [1], how does it interact with CI?&lt;p&gt;The trees in the rebased commits are new and may never have been tested. Is GitHub going to expose a `refs&amp;#x2F;pulls&amp;#x2F;123&amp;#x2F;rebase` ref (cf. the existing `refs&amp;#x2F;pulls&amp;#x2F;123&amp;#x2F;merge`) for running through CI before the button can be pressed?&lt;p&gt;EDIT: The docs [2] say:&lt;p&gt;&lt;pre&gt;&lt;code&gt;  You aren&amp;#x27;t able to automatically rebase and merge on GitHub when:
  
  * Your pull request has merge conflicts.
  * Rebasing the commits from the base branch into the head branch
    runs into conflicts.
  * Rebasing your commits is considered &amp;quot;unsafe&amp;quot;, such as when a
    rebase is possible without merge conflicts but would produce a
    different result than a merge would.
&lt;/code&gt;&lt;/pre&gt;
So I guess the point is moot. You can’t rebase a branch unless the resulting tree is identical to the one you’d get from a merge, and that’s the tree that runs through CI.&lt;p&gt;[1] &lt;a href=&quot;https:&amp;#x2F;&amp;#x2F;twitter.com&amp;#x2F;ChrisGSeaton&amp;#x2F;status&amp;#x2F;780441251992731648&quot; rel=&quot;nofollow&quot;&gt;https:&amp;#x2F;&amp;#x2F;twitter.com&amp;#x2F;ChrisGSeaton&amp;#x2F;status&amp;#x2F;780441251992731648&lt;/a&gt;&lt;p&gt;[2] &lt;a href=&quot;https:&amp;#x2F;&amp;#x2F;help.github.com&amp;#x2F;articles&amp;#x2F;about-pull-request-merges&amp;#x2F;#rebase-and-merge-your-pull-request-commits&quot; rel=&quot;nofollow&quot;&gt;https:&amp;#x2F;&amp;#x2F;help.github.com&amp;#x2F;articles&amp;#x2F;about-pull-request-merges&amp;#x2F;#...&lt;/a&gt;</text></comment>
<story><title>Rebase and merge pull requests</title><url>https://github.com/blog/2243-rebase-and-merge-pull-requests</url></story><parent_chain></parent_chain><comment><author>dorianm</author><text>I&amp;#x27;m surprised there is no &amp;quot;commit tree&amp;quot; drawing to illustrate this.&lt;p&gt;Basically it adds the commits to the master branch without a merge commit:&lt;p&gt;e.g.:&lt;p&gt;&lt;pre&gt;&lt;code&gt;   master: A - B - C
   feature: D - E
   master (after merge): A - B - C - D - E
&lt;/code&gt;&lt;/pre&gt;
See: &lt;a href=&quot;https:&amp;#x2F;&amp;#x2F;help.github.com&amp;#x2F;articles&amp;#x2F;about-pull-request-merges&quot; rel=&quot;nofollow&quot;&gt;https:&amp;#x2F;&amp;#x2F;help.github.com&amp;#x2F;articles&amp;#x2F;about-pull-request-merges&lt;/a&gt;</text></comment>