Conflict resolution

on YouTube ↗37m

" summary

Explains that Git stores full snapshots and performs a three-way merge by finding the nearest common ancestor and adding the two branch deltas, shows concrete examples where cherry-pick uses the parent as the merge base and revert uses the commit itself, demonstrates why non‑commutative edits produce conflicts (e.g. two edits or edit vs delete) and how a file vs directory conflict forces renaming, and maps these behaviors to database concepts like serializability, locks, MVCC and CRDTs.

AI-written summary · about

" chapters (11)

1. 0:00Introduction
2. 1:39Git
3. 3:53Merging
4. 10:00Cherrypick
5. 13:21Revert
6. 15:25Merge conflicts
7. 17:31Commutativity
8. 19:37Serializability
9. 21:58Merge
10. 25:12Two changes
11. 26:47Database analogies

" related talks

• 44mHow to Git Away with MurderSergès Goma · NDC London 2026
• 46mGit internals: Why trees are a developer's best friendSalvador Pérez · Commit Conf 2018
• 27mModern Source and Version Control with GitChristian Couder · FOSSASIA Summit 2017
• 35mStory telling with Git rebaseElle Meredith · RubyConf 2019
• 26mThe Zen of GitTianyu Pu · CascadiaJS 2020
• 50mUnderstanding Git's BehaviourSteve Smith · GOTO London 2015
• 43mGit stories from the front lineNicola Iarocci · Codemotion Milan 2017
• 57mA Piece of GitEdward Thomson · NDC London 2019