Octomerge

Haikus

Branches intertwine
HEAD detached and lost in space
Conflict marks the spot

I see the conflict
I will not help you fix it
Delete the markers

Eight arms hold the code
Two files that cannot be one
Git commit aborted