title: git rebase problems
body: <p>I have been developing a branch happily and each day rebasing each day from the master with:</p>
  
  <pre><code>git rebase master
  </code></pre>
  
  <p>Today when I did a rebase master, I get the following message:</p>
  
  <blockquote>
    <p>Falling back to patching base and
    3-way merge...</p>
  </blockquote>
  
  <p>The rebase took me through a very lengthy process of merging the same set of files over and over again.  It stated "Patch failed at 001" and continued up until 044.</p>
  
  <p>After I had finished the rebase and pushed the branch to the remote, I entered the rebase command again WITHOUT doing any modifications to the code:</p>
  
  <pre><code>git rebase master
  </code></pre>
  
  <p>It then took me through the exact same rebase again.  I am totally lost as to what is going on.  I just want to apply bug fixes from the master to this branch without going through this process each time.</p>
  
  <p>Can anyone help me out with what is going on.  I don't want to have to go through this each time I rebase from the master.</p>