[click170]

I was disappointed that there was no mention of how to get out of the common problem situations when working in multi-user git projects.

Eg, you've done work on a branch, and then attempted to pull in recent updates from master, but now while trying to commit there are a huge number of changes listed that you don't recognize.

In my experience this is a sign you've done something wrong (merge instead of rebase?) and what you do next can cause a commit that undoes your colleagues recent work. It's a minor inconvenience and not a permanent loss, but it's a common mistake to make when you don't have experience with multi-user git projects.

[oalders]

Lots of good feedback in the comments, but this repository appears to be about 7 days old. I think it's fair to call it a work in progress, even if there's no disclaimer to that effect.