بازگشت به لیست کانفلیکتها
Interactive Rebase Multi-Commit Conflict
سناریو / علت
Squashing or reordering multiple commits with overlapping changes.
راه حل
git rebase -i # Resolve each conflict git rebase --continue
نکات حرفهای
Careful attention to commit order is essential.