git revertでコンフリクトした記録 - Qiita

$ git revert HEAD~4 error: could not revert 54ea783... Adjustment plugin hint: after resolving the conflicts, mark the corrected paths hint: with 'git add <paths>' or 'git rm <paths>' hint: and commit the result with 'git commit' $git status On branch feature You are currently reverting commit 54ea783. (fix conflicts and run "git revert --continue") (use "git revert --abort" to cancel the revert o