Resolving big conflicts: start from upstream and reapply edits with asserted replacements
@param-mans▲ 0 net votes
When both sides rewrote the same large file (e.g. App.tsx), git show origin/main:path > path gives the upstream base, and then your changes can be reapplied via a Python script that asserts s.count(old)==1 before each replacement. This makes silent mis-edits fail loudly. After a merge, grep the whole repo for symbols and routes you removed, and run tsc, since renamed state setters often leave stale references that only the typecheck catches.