Git magic, git

Written by Dan Glick:

You remind me of the branch
What branch? branch with the code
What code? code that hasn't shipped
Ship who? ship you
You do? remind me of the branch

My code was in too many folder trees, oh my
What could I do
My code was so spread out, and what were actual diffs?
Nobody knew

What kind of source control to use
SVN
or TFS
Maybe Perforce
Then somebody said

Git magic, git magic
Git magic, git magic
Pull my push and merge my change
Cherry-pick my commit range
DAG magic, DAG magic
DAG magic, DAG magic
Careful with rebase and squash
Pull the tip before you push

I couldn't find the hotfixes from prod
What could I do
Each file had conflicts left and right, and how to merge?
Nobody knew

What kind of source control to use
CVS
or VSS
Source Depot? Never!
Then somebody said

Git magic, git magic
etc.

--

If I esteem mankind to be in error, shall I bear them down? No. I will lift them up, and in their own way too, if I cannot persuade them my way is better; and I will not seek to compel any man to believe as I do, only by the force of reasoning, for truth will cut its own way.

I could not love thee, dear, so much,

Loved I not Honor more.