Git 2.56 is here.

⚡ The new git add --resolved stages only paths that are still marked as conflicted, and refuses to stage them if conflict markers remain. One merge-base case dropped from 0.68s to 0.01s.