title: git - can't merge branch into master, conflicting files
body: <p>I have a file called index.html in master branch. I create dev branch and switch into the dev branch</p>
  
  <pre><code>git branch dev
  git checkout dev
  </code></pre>
  
  <p>I then edit index.html and commit the change</p>
  
  <pre><code>git commit -m "first change" index.html
  </code></pre>
  
  <p>I am still in the dev branch. Now I want master to have this new feature so I try to merge the dev branch into master</p>
  
  <pre><code>git merge master
  </code></pre>
  
  <p>but I get </p>
  
  <pre><code>Auto-merging index.html
  CONFLICT (content): Merge conflict in index.html
  Automatic merge failed; fix conflicts and then commit the result.
  </code></pre>
  
  <p>It seems I am stuck, I have to do git merge --abort but how can I ever do the merge?</p>