INGLORIOUS BASHTURDS PICTURES
“47 conflicts. One branch. No backups.”
MERGE HARD
a parody of Die Hard
git merge --no-ff·yippee-ki-yay, --force pusher·rated R for Rebase
INGLORIOUS BASHTURDS PICTURES presents A CONFLICT RESOLUTION "MERGE HARD" conflict supervisor THE LINTER stash by THE JUNIOR based on a true HEAD