title: rebasing git branches that were rewritten since branching
body: <p>I have a git repository and two branches <code>master</code> and <code>st</code> (branched from <code>master</code>). I want to rebase <code>st</code> onto <code>master</code>. However, <code>master</code> has been massively rewritten by somebody else, to be frank I'm not sure why, but we were prompted to <code>fetch</code> the new <code>master</code> and <code>reset --hard</code> our private branches to it.</p>
  
  <p>If I try <code>git-rebase</code> the listing of non-trivially conflicted files that need manual merges span over two screen pages.
  I know that the actual changes are not that much. For one, the <code>st</code> branch only touched a handful of files (not more than ten, I'd guess).</p>
  
  <p>Besides rebasing I tried to create a patch and apply it, but there are some conflicts as well, which I have no clue how to resolve.</p>