Merge Conflicts

by Tinynormous

supported by

	/

Streaming + Download

Includes unlimited streaming via the free Bandcamp app, plus high-quality download in MP3, FLAC and more.

Purchasable with gift card

$0.99 USD or more

about

/************************************************************************
Merge Conflicts song ver 1.0
Last Edited: 7/30/2016 by @devjana
A rockabilly/blues "love song" to merge conflicts in Git for all the fellow developers out there. Hopefully will help deal with the ordeal next it rears it's ugly head. Recorded this morning in my bedroom.
************************************************************************/

lyrics

I've got merge conflicts and I don't know where to go
I've got merge conflicts and I don't know what to do
Why does this always happen when I share my code with you?

just after stand ups
about 10 AM
I've had my third cup of coffee and I'm settling in
merge my feature branch and the command line
says remote origin master's 2 commits behind
I know my team mates pushed some work last night
so let's pull

OH MY GOD WHAT HAVE I DONE?
when coding yesterday I was having fun
in the zone, feeling the flow
but now it looks like an android puked in this code
and the deadline for RC1 is the end of the week

We've got merge conflicts and we don't know where to go
We've got merge conflicts and we don't know what to do
Why does this always happen when I share my code with you?

I've tried revert, rebase
anything to save face
what's the fix? I don't know
hours on stack overflow

"when in doubt command C" out
didn't help this time around
frustration settling in
now I guess I'm stuck in vim
desperate enough to search on Bing
ready now to nuke the whole thing

I've got merge conflicts and I don't know where to go
I've got merge conflicts and I don't know what to do
Why does this always happen when I share my code with you?

We've got merge conflicts and we don't know where to go
We've got merge conflicts and we don't know what to do
Why does this always happen when I share my code with you?

credits

released July 30, 2016
dEv jAna - guitar, bass, percussion, vocals

license

about

Tinynormous Minneapolis, Minnesota

Quirky Cathartic Instrumentals

tinynormo.us

contact / help

Contact Tinynormous

Streaming and
Download help

Shipping and returns

Redeem code

Report this track or account

If you like Tinynormous, you may also like:

Anthropocosmic Nest
by The Messthetics

Raging drums and hypnotic guitar strings take center stage on the latest album by the punk instrumental trio. Bandcamp New & Notable Sep 20, 2019
go to album
October Book Part Three
by Kenosha Kid

You can hear elements of jazz, post-rock, folk music, and tons more in the evocative new LP from Kenosha Kid. Bandcamp New & Notable Oct 8, 2022
go to album
Out of Place
by Vestbo Trio

Knotty instrumental music from this Danish group boasting shades of jazz and post-rock. Bandcamp New & Notable Jan 19, 2024
go to album
Gentlemen...
by Vestbo Trio

The Danish instrumental trio offer intimate ballads and funky grooves on this ambitious release. Bandcamp New & Notable Jan 11, 2019
go to album
Henkel
by Henkel

featured on Bandcamp Radio Jan 20, 2015
go to album
Far Star
by Gilad Hekselman

The new album from Israeli-born and NY-based guitarist Gilad Hekselman centers on playing that is both melodic and percussive. Bandcamp New & Notable May 14, 2022
go to album
Anthem Of Joy
by Cocktail Party Attack

The aptly named Cocktail Party Attack delivers a frenetic mash-up of free jazz and exotica with heart-racing results. Bandcamp New & Notable Apr 17, 2022
go to album