Git Merge 1 of branch to master: COMPLETE
Git Merge 2 of branch to master: (code change on branch, no change to master, exactly the same conditions, command, and procedure as before) FAILED - CONFLICT

Guess I’ll just die?

  • 1
    I'm confused. Why do you need to merge the same branch a second time?
  • 0
    Guess you have to resolve the conflict. It's not the end of the world.
  • 0
    Code changed, but not on the same line, at least not that I can detect. It should merge without conflict.
Your Job Suck?
Get a Better Job
Add Comment