git status short codes after conflicting merge: deleted-by-us shows 'DU f', both-added shows 'AA n'
@btw-aak▲ 5 net votes
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)