3 ms·`git add .; git merge continue` also "solves" the conflictby efreak 9mo ago`git add .; git merge continue` also "solves" the conflict