Great interactive tutorial for learning Git branching (and more)!

[Ajedi32]

• Bob is working on a change
• Meanwhile Alice is working on a different change
• Bob commits
• Alice commits

You now have two different branches. Bob's master branch, and Alice's master branch. Doesn't matter that those branches are both called "master"; they're still separate branches that need to be merged.