Git Conflicts - Complete Reference | Full Conflict List & Solutions

Custom merge driver cannot resolve conflicts automatically.

# Resolve manually
git add .
git commit

Check merge driver configuration.