سناریو / علت

Rebasing a branch onto another branch where overlapping changes exist, Git stops at conflicted commit.

راه حل

# Resolve conflicts in files
git add .
# Continue rebase
git rebase --continue
# Or abort if needed
git rebase --abort

نکات حرفه‌ای

Resolve commits sequentially; don't skip commits accidentally.