title: Falling into a weird git rebase/pull loop
body: <p>I'm trying to rebase a feature branch with git.</p>
  
  <p>I switched to the master branch with:</p>
  
  <pre><code>git checkout master
  </code></pre>
  
  <p>Got the latest version:</p>
  
  <pre><code>git pull
  </code></pre>
  
  <p>Switched back:</p>
  
  <pre><code>git checkout iss248
  </code></pre>
  
  <p>Rebased:</p>
  
  <pre><code>git rebase master
  </code></pre>
  
  <p>Then for some reason git couldn't fix the conflicts automatically, even though it didn't seem like anything was in conflict: I basically went through all the changes I'd made line by line and approved them.  So then I thought I was done, but</p>
  
  <pre><code>git status
  </code></pre>
  
  <p>Said something like:</p>
  
  <pre><code>On branch iss248
  Your branch and 'origin/iss248' have diverged,
  and have 11 and 7 different commits each, respectively.
    (use "git pull" to merge the remote branch into yours)
  
  All conflicts fixed but you are still merging.
    (use "git commit" to conclude merge)
  
  Changes to be committed:
  
      modified:   chalktalk/apps/exams/forms.py
      modified:   chalktalk/apps/lessons/forms.py
  </code></pre>
  
  <p>And in those files there were weird nested conflicts like this:</p>
  
  <pre><code>&lt;&lt;&lt;&lt;&lt;&lt;&lt; HEAD
  &lt;&lt;&lt;&lt;&lt;&lt;&lt; HEAD
  &lt;&lt;&lt;&lt;&lt;&lt;&lt; HEAD
  =======
          widget=MyFilteredSelectMultiple('lessons'),
  &gt;&gt;&gt;&gt;&gt;&gt;&gt; MyFilteredSelect now takes a content_name parameter
  =======
          widget=MyFilteredSelectMultiple('lessons'),
  &gt;&gt;&gt;&gt;&gt;&gt;&gt; MyFilteredSelect now takes a content_name parameter
  =======
          widget=MyFilteredSelectMultiple('lessons'),
  &gt;&gt;&gt;&gt;&gt;&gt;&gt; 18bc77f3387fc6ee6cdf7203a92136c8837b0e73
  </code></pre>
  
  <p>Am I doing something really obvious wrong?</p>
  
  <p>After</p>
  
  <pre><code>git rebase master
  </code></pre>
  
  <p>Do I need to follow up somehow to make sure that my local changes are reflected on my github branch?  And why would the rebase not know how to resolve 'conflicts' that were basically just a single line inserted?</p>
  
  <p>Thanks!</p>