سناریو / علت

When cherry-picking a commit from develop to stage, lines modified in both branches overlap, causing a conflict.

راه حل

# Stage resolved files
git add .
# Continue cherry-pick
git cherry-pick --continue
# Or abort cherry-pick if needed
git cherry-pick --abort

نکات حرفه‌ای

Always check git status; resolve only staged conflicts before continuing.