3 ms·
Well you just say you compare both of your new versions to the common previous version and work out how to merge them. Seeing the differences between two snapsh
by globular-toast 6y ago
Well you just say you compare both of your new versions to the common previous version and work out how to merge them. Seeing the differences between two snapshots is something easily grasped in my experience. If you can see John changed file A and Jane changed file B then it's obvious how to merge them.
When I teach git I try to convince people that such a system of keeping snapshots is a useful thing to do. Then I introduce diffing which lets you to merges. Then show how git does that automatically.