سناریو / علت

Squashing multiple commits with overlapping changes during interactive rebase.

راه حل

git rebase -i
# Resolve conflicts, then continue
git rebase --continue

نکات حرفه‌ای

Check each commit carefully during squash.