سناریو / علت

One branch deletes a file while the other modifies the same file.

راه حل

# Decide whether to keep or delete the file
git add <file>
git commit

نکات حرفه‌ای

Git marks this file as conflicted; manual resolution is required.