Table of contents
Read changes in context
Review each edit by responsibility: data flow, control flow, interfaces, and callers.
Avoid automatic keep-both decisions when declarations or side effects overlap.
Prove the merged file
Format and analyze the merged output.
Run the smallest relevant tests, then broader required checks.
Review checklist
- Use equivalent source files.
- Normalize only irrelevant differences.
- Check imports, names, and callers.
- Validate behavior after merge.