title: Git conflict while rebase
body: <p>My workgroup requires me to do a <code>git rebase master</code> on my current branch each time before pushing. However, when there are conflicts I find that I have major problems dealing with them.</p>
  
  <p>I can resolve and update the affected files just fine, but after running <code>git add *</code> and <code>git commit -m "commitmsg"</code> Git refuses to carry out the <code>git rebase --continue</code>. Instead I see the following error message:</p>
  
  <blockquote>
    <p>No changes - did you forget to use 'git add'?</p>
  </blockquote>
  
  <p>So I can only run <code>git rebase --abort</code> which undoes everything and sends me back to square one, or <code>git rebase --skip</code>, after which the same conflicts exist again.</p>
  
  <p>Do I misunderstand Git here? What can I do to get out of that infinite loop of resolving the same conflicts over and over again?</p>
  
  <p>EDIT : Running "git rebase --continue" after git add unfortunately produces the same conflicts again.</p>