سناریو / علت

Merging a repository subtree causes overlapping files or directories.

راه حل

# Manually resolve overlapping directories
git add .
git commit

نکات حرفه‌ای

Carefully decide which subtree version to keep.