سناریو / علت

Same file renamed differently on two branches; Git cannot auto-merge.

راه حل

# Use merge tool to select correct version
git add <resolved-file>
git commit

نکات حرفه‌ای

May require moving or renaming files manually.