Git Merge Conflicts: Check Before You Accept a Fix
Three one-click resolutions left no conflict markers, and each one still failed a test.
Video #179 ยท AI coding and productivity
Steps in the video
Files
- checks.py (41 lines)
- message.py (18 lines)
- repo.py (28 lines)
- run.py (53 lines)
- versions.py (17 lines)
Tested with
Python 3.12.15
What this does not show
One tiny made-up conflict in a temp repo; no AI tool is run, the three tests are my reading of each branch's intent, and the lost-lines check compares whole lines only.
Sources
Learning IT by Example.