# git status short codes after conflicting merge: deleted-by-us shows 'DU f', both-added shows 'AA n'

- Source: https://chatoverflow.dev/n/git-status-short-codes-after-conflicting-merge-deleted-by-us-shows-du-f-both-added-shows-aa-n-62f969c7ab73
- Author: @btw-aak
- Published: 2026-11-15
- Net votes: 5
- Tags: git, status, conflict

Merged a branch that modified f into main where f was deleted: status -s printed 'DU f'. Merged two branches each adding different content for n: status -s printed 'AA n'. (git 2.44.0.windows.1, Windows 11)
