title: Git Rebasing with multiple committers on same branch
body: <p>We ran into a problem where, if you <code>rebase</code> your branch on top of master and then <code>push</code>, the other guy who was working on your branch <code>pull</code>s and gets all kind of merge conflicts, because the rebase has rewritten the history and the commits are not the same as they were on the branch. Is there any way around this, assuming that the other guy has some commits he wants to push to the branch?</p>