fix-merge-conflicts

Resolve git merge conflicts correctness-first, then prove the tree still builds. Use when a merge, rebase, cherry-pick, or stash pop leaves conflict markers, when git status shows unmerged paths, or when the user asks to fix conflicts, resolve a merge, or rebase onto the trunk and clear the conflicts.

gitmergerebaseconflicts

shipshitdev

353

merge-open-prs

Review and land open pull requests through one /merge command. The default mode runs a confirmation-gated trunk sweep and reports cleanup candidates; exact /merge force drains the queue non-serially by merging green PRs and narrowly fixing red PRs. Use when asked to review and merge open PRs, batch-merge to trunk, drain PR WIP, or run /merge.

gitgithubpull-requestmerge

shipshitdev

353

finishing-a-development-branch

>-

gitbranchmergepull-request

shipshitdev

353

github-sync-upstream

>-

githubsyncupstreamfork

zdtsw

3674