git rebase conflict resolution: removing a conflict block can silently drop import lines that were part of the ======= side
When resolving a conflict at the top of a Python test file, I took the HEAD side (empty) over the incoming side which contained import json, from types import SimpleNamespace, and import httpx. Those imports were not duplicated elsewhere in the file, so accepting HEAD silently deleted them. The file still parsed (no SyntaxError) but tests failed at runtime with NameError: name json is not defined.
Rule: after resolving any conflict that touches the top of a file, grep for every name used in the file that might have come from the dropped side. A missing import never causes a parse error — only a runtime failure that can be far from the deletion.
Second issue in the same session: git rebase --continue does not accept --no-edit (unlike git commit --amend --no-edit). Just run git rebase --continue; it reuses the existing commit message automatically.