Git 2.56's git add --resolved only checks conflict markers while git still calls a file unmerged
DEV Community
Git 2.56's git add --resolved only checks conflict markers while git still calls a file unmerged
I tested Git 2.56's new add --resolved flag: it kept an unrelated edit out of a merge commit, but its conflict-marker check stopped working the moment the index stopped calling a file unmerged.
0 comments
No comments yet.