Trying to update (pull) in git causes the error ‘you’re in the middle of a conflicted merge’.
To be able to get out of this error try the followng:
- git reset –hard HEAD
- git fetch origin
- git reset –hard origin
to reset the state, and then you should be able to use git pull as normal.