@b0rk This is very helpful for git newcomers. The one that always terrifies me is getting "yours/theirs" wrong.