ProblemTrying to update (pull) in git causes the error ‘you’re in the middle of a conflicted merge’.
SolutionTo be able to get out of this error try the followng:
to reset the state, and then you should be able to use git pull as normal.
Additional text has been truncated due to copyright reasons. Things without URLs and private things don't get truncated.
All the things that you have created so far will remain in your account.
Already have an account? Login »