title: Git: How to bring a project branch with sub-branches easily into master?
body: <p>Situation: A repository with a master branch (green line) and a project branch, which has multiple sub-branches. Our rule is, everything that goes into Master, goes there via a pull request.</p>
  
  <p><a href="https://i.stack.imgur.com/VSqbK.png" rel="nofollow noreferrer"><img src="https://i.stack.imgur.com/VSqbK.png" alt="Git Branches"></a></p>
  
  <p>This situation should be quite common, - but somehow I did not find an answer to my question:</p>
  
  <p>How can I bring that blue branch properly and easily back into the green master branch?</p>
  
  <p>I have tried rebasing, and the first 20 commits go through well, but thereafter, it asks me to resolve conflicts manually for every following commit. I would prefer to have to solve the whole thing just <em>once</em>, not for every commit in the micro project. Can't I just rebase the "sum of commits" of the blue branch to the master branch?</p>
  
  <p>One colleague suggested to create a new (pink, not in the diagram) branch, branched from the same green commit as the blue micro project branch, create a diff between the commit we branched from and the last blue commit - and apply that diff to the pink branch. This seems feasible to me, but I wonder if there is really no solution which is more git-style...?</p>