سناریو / علت

Both branches modified a binary file (e.g., image, Excel), Git cannot auto-merge.

راه حل

# Manually choose correct file version
git add <file>
git commit

نکات حرفه‌ای

Binary files require human decision; Git cannot merge automatically.