title: How to submit multiple pull-requests in GitHub when they may conflict slightly
body: <p>I am submitting two independent new features to a project as pull-requests. Each feature is in a topic branch, each branching from the tip of master.</p>
  
  <pre><code>          /-- feature1
  master ---
            \-- feature2
  </code></pre>
  
  <p>The problem is that while either branch can be cleanly merged into master by itself, when the second branch is merged it will create conflicts. This isn't because the features depend on each other, they just happen to touch the same code.</p>
  
  <p>A trivial example: if the original file was a comma-separated list, and each commit wanted to add one new item to it, it may look like this:</p>
  
  <pre><code>master:
  a,
  b,
  c
  
  feature1:
  
  - c
  + c,
  + d
  
  feature2:
  
  - c
  + c,
  + e
  </code></pre>
  
  <p>At the end of the day, if both pull-requests are accepted, both d and e should eventually be added to the list, in any order (since the features are entirely separate, so they don't depend on each other). However, if you tried to pull them both in you'd get a conflict.</p>
  
  <p>What's the best way to deal with this? Should feature2 be based off of the end of feature1, and then they should be merged in the correct order into master? </p>
  
  <pre><code>master ---
            \--- feature1
                \------ feature2
  </code></pre>
  
  <p>If I did that, would the pull-request for feature2 show just the feature2 commits, or will it show all the feature1+feature2 commits?</p>
  
  <p>Or should I just rebase feature2 after feature1 is merged into master?</p>