From Dev.to
Git 2.56's git add --resolved only checks conflict markers while git still calls a file unmerged
Git 2.56 shipped a new flag for the oldest bad habit in merge conflict resolution: typing git add . the moment the markers are gone, and staging whatever else happened to be sitting in the working tre...
