Merge Like It's 2099
summary
An open-source Python tool integrates with Git via .git/config and runs a pipeline of small, language-aware resolvers to auto-handle import additions, overlapping edits, and same-line tweaks, before falling back to a configured manual merge tool. It supports Java, XML, Python, C++ and plain text files, reports each auto-resolution, and reduced manual conflicts by 75% in the presenter’s tests (processed 37 files with ~60 conflict hunks resulting in 3 manual resolutions); the implementation is available as Python scripts on GitHub.
AI-written summary · about
chapters (10)
- 0:00Introduction
- 1:09Deezer’s Git conflict history
- 3:57Common Git conflict problems
- 6:05Smart merge tool demo
- 8:34Git tool config
- 11:59Results and conflict reduction
- 13:45Future tool evolution
- 14:28Comparison with other tools
- 18:43Custom conflict resolution script
- 22:18Q&A
related talks
19m"Please Let Me Merge Before I Start Crying": And Other Things I've Said at The Git Terminal
21mFighting Git Workflows
01h 08mHow Effective Teams Use Git
21mGit Good – How knowing git can make your life easier
01h 08mHow Effective Teams Use Git
45mFrom Git Panic to Git Zen: With a Little Help from AI
42mGit Fu Developing
21mTeach Your Old Code New Tricks: Automating Code Quality in Large Projects