Problem
Trying to update (pull) in git causes the error ‘you’re in the middle of a conflicted merge’.

Solution
To be able to get out of this error try the followng:

  1. git reset –hard HEAD
  2. git fetch origin
  3. git reset –hard origin

to reset the state, and then you should be able to use git pull as normal.