I was reading Reddit threads about Git annoyances — not big architecture debates, just the little things that waste time. One kept coming up: merge conflicts that are only import lines at the top of a Python file.
Someone on one branch adds import os. Someone else adds import math. Same file, same place. Git treats it like a real conflict, and you end up deleting conflict markers by hand even though you just want both imports.
The cover image is a quick sketch I made in Excalidraw while figuring out the flow: conflict in → one command → clean imports out.
What I looked at
Before writing anything, I checked how this is usually handled:
