You have not concluded your merge (MERGE_HEAD exists) - ARRRGH! FFS Git! (╯°□°）╯︵ ┻━┻)

photo credit: Walking dead via photopin (license)

You have not concluded your merge (MERGE_HEAD exists)

TL;DR Git - Basic Merge Conflicts

Rant:

FFS Linus! Why did you have to make Git so complicated? 

As others have pointed out. You need a bunch of arcane, inconsistent, constantly changing commands to do the most routine of tasks and the behaviour is counter-intuitive - why make vim the default editor?! Why make me learn all this stuff just to get things done?! *sigh* 

No fucks given Linus:

The readme file of the source code elaborates further:

4 Interesting Comments

Getting my daily dose of tech-trash-talk from the Vulture came across this interesting article:

http://www.theregister.co.uk/2016/06/07/from_iwarp_to_knights_landing_james_reinders_leaves_intel/

About Intel's guru of parallelism taking early retirement, but it was the 4 comments that I liked as short insightful thoughts on the current state of concurrency despite long term work over decades:

http://forums.theregister.co.uk/forum/1/2016/06/07/from_iwarp_to_knights_landing_james_reinders_leaves_intel/

As someone who dabbles in the field and with an MSc based on CSP by Sir Tony it is a shame that we are not much further on.