When I realised it was all about share-xor-mutate, just like all reasonable systems: Rebase and force-push on your own branches only (they are mutations), pull

When I realised it was all about share-xor-mutate, just like all reasonable systems: Rebase and force-push on your own branches only (they are mutations), pull-request when putting stuff onto other branches. I also find the whole git tree WAY easier to read if it's fast-forward-only, and no merge commits. Atlassian's not as popular as they used to be I guess, but I found Bitbucket presents the best view of the git tree ever. When I wanted to do anything advanced, I'd look at the Bitbucket view, do local git commands in my shell, push, and then watch Bitbucket again.