A bunch of Git situations and what I have done