Skip to content

Add sync-with-base-branch step to /ship to prevent merge conflicts #23

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sebastientaggart merged 1 commit into from
Mar 26, 2026
Merged

Add sync-with-base-branch step to /ship to prevent merge conflicts #23

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 30 additions & 5 deletions skills/ship.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,32 @@ If a linked issue number is identifiable, note it for the PR body. If not identi

---

## Step 4 — Commit
## Step 4 — Sync with base branch

Bring the feature branch up to date before committing:

{{#if BRANCH_DEV}}
```
git fetch origin {{BRANCH_DEV}} && git merge origin/{{BRANCH_DEV}}
```
{{/if}}
{{#if !BRANCH_DEV}}
```
git fetch origin {{BRANCH_PROD}} && git merge origin/{{BRANCH_PROD}}
```
{{/if}}

If the merge completes cleanly (including fast-forward), proceed to Step 5.

If there are merge conflicts, **stop** and say:

> "Merge conflicts with `<base branch>`. Resolve them before shipping."

List the conflicting files. Help the user resolve them if asked, then continue.

---

## Step 5 — Commit

Stage all changes and commit:
```
Expand All @@ -74,7 +99,7 @@ Commit message rules:

---

## Step 5 — Push and open PR
## Step 6 — Push and open PR

First, push the branch:
```
Expand Down Expand Up @@ -121,9 +146,9 @@ Omit the issue line entirely if no linked issue was identified in Step 3.

---

## Step 6 — Review (conditional)
## Step 7 — Review (conditional)

If `{{REVIEW_GATE}}` is `"off"`, skip directly to Step 7 (merge without review).
If `{{REVIEW_GATE}}` is `"off"`, skip directly to Step 8 (merge without review).

Otherwise, load `{{REVIEW_AGENT_PROMPT}}` and perform the review for this PR.

Expand All @@ -140,7 +165,7 @@ Wait for the review to complete and report its verdict.

---

## Step 7 — Act on verdict
## Step 8 — Act on verdict

{{#if BRANCH_DEV}}
Merge command (used by all paths below): `{{MERGE_CMD}}`
Expand Down
Loading