My current client uses an (onsite?) enterprise github thingy. We do basically branch-per-feature, which means a lot of merging. And surprisingly few conflicts. I find myself constantly going back to this graph:
It’s not available on the free public github, AFAIK. You can see where people pulled from Refactor back into their feature branch, and how much context switching there is (we have two folks working on the project).
A video that really explained git to me was this:
It highlighted the directed graph structure, and the role that nodes and labels play. After watching it, I understood Fetch, Pull, Push, Add, etc – it all made sense!
However, I’ll confess – I’m using tortoiseGit, not the git command line.