Git 2.56's git add --resolved only checks conflict markers while git still calls a file unmerged November 17, 2026 · Dev.to Read full story at source