How did I spend my day.
Why over 6 hours trying to merge development to master in Git.
Rebase 245 steps in phase one
Rebase 342 steps in phase two.
this would have taken a whole 15 mins in TFS
**sigh**
I loath GIT and LInus Torvald with the force of a million super novae