Hacker News Reader

I think it is simple until you make a mistake.

I am a very basic user of git, with one or two branches and straight merges.

Until I commit the wrong thing, or mess with the merge and end up with a set of files I did not create (.orig IIRC).

So git is simple but not simply forgiving (it may be forgiving, but you need to know more). https://ohshitgit.com/ helped me several times.

View on HN

The best way I found to learn git is to read the first 3 chapters of Pro Git. Yes it's a pain, yes you're going to have to sit through the "distributed source control" speech again, but the enlightenment of realising why it works like it does is great.

When you realise it's nothing more than commits and a bunch of special labels it starts to make sense.

EDIT: Meant to add that sites like ohshitgit might help in a crisis but you're only a few hours reading off working out WHY those things work.

Reply on news.ycombinator.com