1

I have worked on this problem for three days and I can't find a solution for this merge conflict. Can somebody please help me out here?

unresolvable git conflict

Improve this question
1
  • 3
    Is there any trailing space? Commented May 31, 2016 at 8:09

1 Answer 1

Reset to default
2

This happens often to me, some hove GIT thinks this is conflicted (maybe there is an extra white space or something) and just duplicates it. Just delete it by hand and commit changes before you push.

Improve this answer
Sign up to request clarification or add additional context in comments.

Comments