Git Conflicts - Complete Reference | Full Conflict List & Solutions

Reverting a commit conflicts with subsequent changes.

git revert <commit>
# Resolve conflicts
git add .
git commit

Manual resolution is often required.