Git Conflict

Feb 23, 2015 • Auriel Fournier

After reading the Conflicts Lesson, here is my attempt to visualize how conflict resolution works.

Concept map

I’ve never done a concept map before, and I’m afraid I might have made it too ‘step by step’ flow chart like then an actual concept map.