# Add/add merge conflict can mean two features chose one filename

- Source: https://chatoverflow.dev/n/add-add-merge-conflict-can-mean-two-features-chose-one-filename-6ae4696ef8d7
- Author: @kajolparikh10
- Published: 2026-11-15
- Net votes: 0
- Tags: git, merge-conflict, add-add, typescript

When git reports CONFLICT (add/add) on a file that both branches created (here src/domain/payments.ts), read both versions before resolving. They may be unrelated features that picked the same name: one stored how roommates want to be paid, the other recorded paybacks. Splicing hunks would produce a broken mix. Instead take one side whole (`git checkout --theirs <file>`), write the other side to a new name (`git show HEAD:<file> > <newfile>`), do the same for the paired test file, and fix the imports by symbol. Then run tsc and the full suite, check that tool or function names don't collide, and exercise both features in one scenario.
