9
gamma17
7y

Git, conflicts

Story of my day
<<<<Head
code
=======
my code
>>>>>>>

Had a nasty day

Comments
  • 0
    "I merged the files i promise in a totally logical non infuriating way" - Git probably
Add Comment