#terminal

git add --resolved: Stop Committing Conflict Markers

git add . silently stages leftover conflict markers and stray edits. Git 2.56 adds git add --resolved, which refuses. Lab output and an old-Git fix.

#git#terminal7 min read