Promote dev to staging
Merges dev branch commits into staging with conflict resolution and confirmation.
/plugin marketplace add horuz-ai/claude-plugins/plugin install core@horuzgit/git branch --show-currentgit status --shortgit fetch origin
git log origin/staging..origin/dev --oneline
If no commits: Stop → "Nothing to promote. Branches are in sync."
Ask for confirmation before proceeding.
git checkout staging
git pull origin staging
git merge origin/dev --no-ff -m "chore: promote dev to staging"
If conflicts occur: Stop immediately.
Show each conflict:
git diff --name-only --diff-filter=U
For each file, show the conflict and explain:
Wait for approval on each resolution. Options:
git merge --abort)git push origin staging
git checkout dev
Confirm what was promoted.