title: Alternative to git rebase
body: <p>I am new to git.
  Let's say, I have forked a repository locally from remote, and it is called localRepo. There are two branches Master and testBranch. testBranch is 100 commits ahead and 5000 commits behind. Changes were made to testBranch but never incorporated to Master. So I wanted to rebase testBranch onto master in my forked localRepo. </p>
  
  <p>I did the following:</p>
  
  <ol>
  <li><code>git checkout testBranch</code></li>
  <li><code>git fetch origin</code></li>
  <li><code>git rebase origin/Master</code></li>
  </ol>
  
  <p>I am experiencing several conflicts and I am solving it by hand using mergetool (kdiff3) and by saying which deleted or modified file to use etc...</p>
  
  <p>Since it is around 5000 commits behind, are there possibilities for more conflicts to occur? If i resolve conflicts manually like this, I wonder how many days would it take! It would be very tedious and unpractical.</p>
  
  <p>Am I doing it in the right way? </p>
  
  <p>Is this the only way for this scenario? Or any other efficient way?</p>