Teaching Git branching? Skip the diagram. Have students role-play editing a document with sticky notes, then merge by hand. Conflicts stop being scary once you've resolved one physically.

#TeachingCS #Git