Re: March 10, 2015

[http://dummy.us.eu.org/robert (Robert)]

 > From: http://www.cs..edu/~b
 > Date: Thu, 19 Mar 2015 17:25:44 -0700
 >
 > on fighting Git (absolutely the worst piece of software ever written,
 > bar none, and yes I've tried using Windows 8).

I wouldn't say it's the worst, but, at best, it's definitely
non-intuitive.

 > Luckily one of the four people on earth who can get Git to work is our
 > wunderkid Nathan, and he was at EDC yesterday to work on an unrelated project,
 > so we got to borrow him long enough to solve a gnarly Git problem involving a
 > file that somehow ended up containing a conflict diff of two conflict diffs.

I've learned that reflog is your friend.  When things like this happen, I
re-grab the historical files and re-do everything again by hand.

I've been slowly coming to realization that most source code control
systems suck.  The more powerful they are, the more they suck.  rcs sucked
the least; cvs sucked a little more; ClearCase sucked a little more;
Perforce and git suck the most.