Octomerge

Haikus

Branches intertwine \nHEAD detached and lost in space \nConflict marks the spot

I see the conflict \nI will not help you fix it \nDelete the markers

Eight arms hold the code \nTwo files that cannot be one \nGit commit aborted