22
eo2875
3y

Unresolvable merge conflicts

Comments
  • 0
    Maybe there are tabs or/and some spaces
  • 2
    Spaces vs tabs war?
  • 3
    @hack Just an extra new line, sine current has no content
  • 2
    Sorry I can't help you with this. This is a hard one. I need calculator and ruler to fix this conflict.
  • 0
    I have been told off in the past for removing a seemingly arbitrary line break in a git merge where neither branch was mine.
  • 0
    Lemme pull out my sextant and solve that for yah.
  • 2
    I'm sorry this is beyond my expertise, you're on your own
  • 0
    You are in deep shit !
    Use a linter :)
  • 1
    git merge --abort

    no chance to solve that..
Add Comment