title: Git rebase interactive error
body: <p>I want to merge my branch (lets call it <code>my_branch</code>) to master. It has 1 file showing up as a merge conflict on my pull request on github.com . Before rebasing I want to squash my commits (11 commits). So I did something like this:</p>
  
  <pre><code># On master
  git pull
  git checkout my_branch
  # on my_branch
  git fetch
  git rebase -i origin/master
  </code></pre>
  
  <p>This opened a vim editor with all my commit - I kept the 1st one as <code>pick</code> and changed the rest to <code>s (squash)</code></p>
  
  <pre><code>pick commit1
  s commit2
  s commit3
  .
  .
  .
  s commit 11
  </code></pre>
  
  <p>When I save and quit I get an error - <code>error: could not apply e7ce468... 'commit1 message'</code></p>
  
  <p>Can anyone explain to me what the issue is? I know I cannot rebase with out squashing as each and every commit will then need to be resolved..</p>