“git undo comflicted merge” Ответ

git undo comflicted merge

git merge --abort