Includes unlimited streaming via the free Bandcamp app, plus high-quality download in MP3, FLAC and more.
Purchasable with gift card
$0.99USD 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
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
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