Use this skill for the full branch-update flow: fetch origin/main, merge it into the current branch, resolve conflicts, create the merge commit non-interactively, and push the synced branch.
Read merge workflow details for source-of-truth checks, conflict rules, safety rules, and output fields.
Defaults
- Repository and branch: current checkout.
- Remote and merge target:
origin/main.
- Push target: current branch upstream when one exists.
- Flow: non-interactive, preserve git's prepared merge message, push after success unless the user asks for local-only.
Preconditions
- Inspect
git status -sb.
- Require a clean working tree before starting a new merge.
- Stop if detached, not on a named branch, or on
main without explicit instruction.
- If a merge is already in progress, inspect
MERGE_HEAD and MERGE_MSG; continue only when it is clearly the requested origin/main merge.
Workflow
- Capture branch name, upstream branch, and merge state.
- Run
git fetch origin main.
- Start
git merge --no-ff --no-commit origin/main; if already up to date, report that no merge commit was needed.
- If conflicts exist, prefer
fix-merge-conflicts; otherwise inspect conflicted files, resolve clear conflicts, ask only for genuinely ambiguous decisions, and verify no unmerged paths or conflict markers remain.
- Finish with
GIT_EDITOR=true git commit, updating MERGE_MSG first only when the prompt explicitly asks to include a CI marker on the merge commit. For ordinary requests to trigger actions or run GitHub Actions, push the merge commit first and then create a separate empty #CI trigger commit.
- Push to the configured upstream when present. If push fails, report the failure and do not claim the remote conflict is fixed.
- Report branch, merge target, push target, conflict status, resolved files, final merge commit subject, and push status.
Composition
This skill is intentionally thin. Use fix-merge-conflicts for active conflict resolution when available. Do not route the final merge commit through the generic commit skill, and do not create a second commit after fix-merge-conflicts completes a merge.
1---2name: merge-main-into-branch3description: Fetch the latest `origin/main`, merge it into the current branch, resolve merge conflicts, finish the merge commit non-interactively, and push the synced branch. Use when a branch or PR is behind `main`, GitHub reports merge conflicts, or the user explicitly asks to merge `origin/main` into the current branch.4---56Use this skill for the full branch-update flow: fetch `origin/main`, merge it into the current branch, resolve conflicts, create the merge commit non-interactively, and push the synced branch.78Read [merge workflow details](references/merge-workflow.md) for source-of-truth checks, conflict rules, safety rules, and output fields.910## Defaults1112- Repository and branch: current checkout.13- Remote and merge target: `origin/main`.14- Push target: current branch upstream when one exists.15- Flow: non-interactive, preserve git's prepared merge message, push after success unless the user asks for local-only.1617## Preconditions1819- Inspect `git status -sb`.20- Require a clean working tree before starting a new merge.21- Stop if detached, not on a named branch, or on `main` without explicit instruction.22- If a merge is already in progress, inspect `MERGE_HEAD` and `MERGE_MSG`; continue only when it is clearly the requested `origin/main` merge.2324## Workflow25261. Capture branch name, upstream branch, and merge state.272. Run `git fetch origin main`.283. Start `git merge --no-ff --no-commit origin/main`; if already up to date, report that no merge commit was needed.294. If conflicts exist, prefer `fix-merge-conflicts`; otherwise inspect conflicted files, resolve clear conflicts, ask only for genuinely ambiguous decisions, and verify no unmerged paths or conflict markers remain.305. Finish with `GIT_EDITOR=true git commit`, updating `MERGE_MSG` first only when the prompt explicitly asks to include a CI marker on the merge commit. For ordinary requests to trigger actions or run GitHub Actions, push the merge commit first and then create a separate empty `#CI` trigger commit.316. Push to the configured upstream when present. If push fails, report the failure and do not claim the remote conflict is fixed.327. Report branch, merge target, push target, conflict status, resolved files, final merge commit subject, and push status.3334## Composition3536This skill is intentionally thin. Use `fix-merge-conflicts` for active conflict resolution when available. Do not route the final merge commit through the generic `commit` skill, and do not create a second commit after `fix-merge-conflicts` completes a merge.
willakins