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

Stevoisiak
  • 23,794
  • 27
  • 122
  • 225
thgie
  • 2,367
  • 1
  • 18
  • 28

1 Answers1

3

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.

Ales Maticic
  • 1,895
  • 3
  • 13
  • 27