بازگشت به لیست کانفلیکتها
Fast-forward Merge Blocked
سناریو / علت
Cannot fast-forward because branch histories diverged.
راه حل
git merge --no-ff <branch> # Resolve conflicts manually if any
نکات حرفهای
May need manual merge for overlapping files.