Run any Skill in Manus with one click

pr-merge

Stars45

Forks33

UpdatedJune 19, 2026 at 04:11

This skill should be used when the user asks to "merge a branch", "merge X into Y", "resolve this merge", "finish the merge", "help with merge conflicts", or is sitting on an in-progress merge with conflict markers. It runs `git merge --no-commit`, investigates *why* each side made its changes via `git log`/`gh pr view`, catches silent non-conflicting overlaps (schema/API drift, codegen, flags, tests), and summarises every resolution in a table with PR/issue citations. Trigger it any time a merge needs more than a trivial fast-forward.

Installation

Install with Codex or Claude Copy this prompt, paste it into Codex, Claude, or another assistant, and let it review the skill page and install it for you.

Run Skill in Manus

Source

msupply-foundation

msupply-foundation/open-msupply

View GitHub Repository View Creator Repositories

Download

Run Skill in Manus

Related occupationsSOC

Based on SOC occupation classification

Software DevelopersComputer and Mathematical Occupations·SOC 15-1252

SKILL.md

readonly

name	pr-merge
description	This skill should be used when the user asks to "merge a branch", "merge X into Y", "resolve this merge", "finish the merge", "help with merge conflicts", or is sitting on an in-progress merge with conflict markers. It runs `git merge --no-commit`, investigates why each side made its changes via `git log`/`gh pr view`, catches silent non-conflicting overlaps (schema/API drift, codegen, flags, tests), and summarises every resolution in a table with PR/issue citations. Trigger it any time a merge needs more than a trivial fast-forward.
argument-hint	[<branch-or-ref>]

Merge a branch (or finish an in-progress merge), investigate why each side made its changes, and summarise the resolution in a table.

Arguments: [<branch-or-ref>] — branch to merge into the current one. If omitted, check for an in-progress merge and resolve that. Otherwise ask.

Step 1: Set up

Detect in-progress merge via git status (look for "You have unmerged paths" / "All conflicts fixed but you are still merging"). Don't rely on .git/MERGE_HEAD — that path is wrong inside worktrees. If you need the file directly, resolve it with git rev-parse --git-path MERGE_HEAD.
If no merge in progress: git fetch if needed, then git merge --no-commit --no-ff <branch>. Don't abort on conflicts.
OURS = HEAD, THEIRS = the other side. Find the merge base.

Step 2: Investigate

For each conflicting hunk AND each non-trivial non-conflicting overlap:

Read the hunk in context.
Blame each side: git log <base>..OURS -- <file> and same for THEIRS. For specific lines use git log -L.
Map commit → PR: gh api repos/:owner/:repo/commits/<sha>/pulls. Read the PR/issue with gh pr view / gh issue view to capture motivation, not just the diff.

Step 3: Look for silent (non-conflicting) merge problems

Conflict markers only catch textual overlap. Also check:

Migrations / schema — both sides added migrations, numbering or sequence collides, or one side's migration assumes a column the other side renamed.
API ↔ caller drift — one side changed a function signature, struct field, GraphQL schema, route, or type; the other side added new callers using the old shape. Enumerate renames per side: git diff <base>..<side> -- '<lang-globs>' | grep -E '^[+-]\s*pub (fn|struct|enum)|^[+-]\s*pub [a-z_]+:'. For any symbol present on one side and absent on the other, grep the merged tree for old-name callers. Pay extra attention to renamed fields on shared row/filter/input types — conflict markers won't catch new callers added on the other branch.
Generated files — codegen outputs (.generated.ts, lockfiles, schema dumps) that need regeneration after merge.
Config / feature flags — one side removed a flag the other side started using.
Tests — new tests on one side that exercise code the other side changed.

Flag these in the table even though git didn't mark them as conflicts.

Step 4: Resolve

Pick OURS / THEIRS / BOTH / CUSTOM per hunk. Prefer the side whose motivation is still load-bearing; combine if both are. Ask the user for risky/ambiguous picks before writing. git add each resolved file.

Never use -X ours/-X theirs — they skip the investigation this command exists for.

Step 5: Summary table

File:Lines	Ours (PR/issue)	Theirs (PR/issue)	Picked	Why

File:Lines must be a clickable markdown link relative to the repo root: [file.rs:42-55](path/to/file.rs#L42-L55) (single line: #L42). Do not use backticks or plain text for the path.
One row per hunk (group only if reasoning is identical).
Include silent-conflict rows from Step 3 (mark Picked as e.g. BOTH + regen or CUSTOM).
Cite PR/issue numbers; if none found, write commit <sha>: <subject>.
"Why" references motivation, not recency. Mark (user-directed) where the user decided.

Step 6: Finish

git diff --check for leftover markers.
Run typecheck/cargo check on the merged tree before producing the table — this is the backstop for silent symbol/field renames Step 3 missed. Pipe slow output to /tmp/pr-merge-check.out and grep. Treat any errors as additional rows in the table and fix them.
Show the table + git status. Do not commit or push — wait for the user.

More from this repository

same repository

add-synced-table

msupply-foundation/open-msupply

Walk through adding a new table to the open-mSupply server and wiring it into sync. Use when the user wants to "add a new table and make it sync", "make a table sync over v7", "integrate a table that already syncs in v5/v6 but isn't processed yet", or otherwise add/sync a server table. It loads sync-context, then follows the annotated reference guides (repository + migration, changelog, sync-style classification, legacy v5/v6 translation, V7 integration) with worked code, and ends with the verification commands. Trigger whenever a new synced table needs to be added on the server.

2026-06-2545

pr-review

msupply-foundation/open-msupply

This skill should be used when the user asks to "review this PR", "review the changes", "review against the issue", "code review this branch", "check this PR for issues", or pastes a GitHub PR/issue number/URL and wants feedback. It fetches the issue requirements, computes the right diff base (PR base, upstream, or merge-base fallback), checks requirement coverage, flags unmentioned changes, and produces a severity-graded findings report. Trigger it whenever the user wants a structured code review tied to a specific issue or PR.

2026-06-2545

sync-context

msupply-foundation/open-msupply

Load the context required to work on Open-mSupply's synchronisation system. Use this before answering any non-trivial sync question or making changes to sync code — it reads the canonical sync design docs and points at the code entry points (v5/v6/v7 transports, changelog, sync buffer, translations, sync styles). Trigger when the task touches sync, the changelog, sync_buffer, translators, or sync-style classification. To add a brand-new synced table, use the add-synced-table skill (which builds on this context).

2026-06-2545

sync-styles-doc

msupply-foundation/open-msupply

Regenerate the plain-English sync-styles reference doc (`docs/content/docs/sync/sync_styles/_index.md`) from the current state of the code. Use this whenever `sync_style.rs`, `generate_changelog.rs`, the changelog row shape, transport filters, or translator opt-ins change, so the human-readable doc stays in sync with the code. Trigger on "regenerate sync styles doc", "update sync_styles", or after editing sync-style classification.

2026-06-2545

pr-create

msupply-foundation/open-msupply

This skill should be used when the user asks to "create a PR", "open a pull request", "raise a PR", "submit a PR", "push and open a PR", or describes shipping work for a GitHub issue (e.g. "let's PR this for issue 1234"). It branches, commits, fills out the repo's PR template, gates on user approval via plan mode, and runs `gh pr create`. Trigger it whenever the user is ready to turn local work into a pull request.

2026-06-1945

name	pr-merge
description	This skill should be used when the user asks to "merge a branch", "merge X into Y", "resolve this merge", "finish the merge", "help with merge conflicts", or is sitting on an in-progress merge with conflict markers. It runs `git merge --no-commit`, investigates why each side made its changes via `git log`/`gh pr view`, catches silent non-conflicting overlaps (schema/API drift, codegen, flags, tests), and summarises every resolution in a table with PR/issue citations. Trigger it any time a merge needs more than a trivial fast-forward.
argument-hint	[<branch-or-ref>]

Merge a branch (or finish an in-progress merge), investigate why each side made its changes, and summarise the resolution in a table.

Arguments: [<branch-or-ref>] — branch to merge into the current one. If omitted, check for an in-progress merge and resolve that. Otherwise ask.

Step 1: Set up

Detect in-progress merge via git status (look for "You have unmerged paths" / "All conflicts fixed but you are still merging"). Don't rely on .git/MERGE_HEAD — that path is wrong inside worktrees. If you need the file directly, resolve it with git rev-parse --git-path MERGE_HEAD.
If no merge in progress: git fetch if needed, then git merge --no-commit --no-ff <branch>. Don't abort on conflicts.
OURS = HEAD, THEIRS = the other side. Find the merge base.

Step 2: Investigate

For each conflicting hunk AND each non-trivial non-conflicting overlap:

Read the hunk in context.
Blame each side: git log <base>..OURS -- <file> and same for THEIRS. For specific lines use git log -L.
Map commit → PR: gh api repos/:owner/:repo/commits/<sha>/pulls. Read the PR/issue with gh pr view / gh issue view to capture motivation, not just the diff.

Step 3: Look for silent (non-conflicting) merge problems

Conflict markers only catch textual overlap. Also check:

Migrations / schema — both sides added migrations, numbering or sequence collides, or one side's migration assumes a column the other side renamed.
API ↔ caller drift — one side changed a function signature, struct field, GraphQL schema, route, or type; the other side added new callers using the old shape. Enumerate renames per side: git diff <base>..<side> -- '<lang-globs>' | grep -E '^[+-]\s*pub (fn|struct|enum)|^[+-]\s*pub [a-z_]+:'. For any symbol present on one side and absent on the other, grep the merged tree for old-name callers. Pay extra attention to renamed fields on shared row/filter/input types — conflict markers won't catch new callers added on the other branch.
Generated files — codegen outputs (.generated.ts, lockfiles, schema dumps) that need regeneration after merge.
Config / feature flags — one side removed a flag the other side started using.
Tests — new tests on one side that exercise code the other side changed.

Flag these in the table even though git didn't mark them as conflicts.

Step 4: Resolve

Never use -X ours/-X theirs — they skip the investigation this command exists for.

Step 5: Summary table

File:Lines	Ours (PR/issue)	Theirs (PR/issue)	Picked	Why

File:Lines must be a clickable markdown link relative to the repo root: [file.rs:42-55](path/to/file.rs#L42-L55) (single line: #L42). Do not use backticks or plain text for the path.
One row per hunk (group only if reasoning is identical).
Include silent-conflict rows from Step 3 (mark Picked as e.g. BOTH + regen or CUSTOM).
Cite PR/issue numbers; if none found, write commit <sha>: <subject>.
"Why" references motivation, not recency. Mark (user-directed) where the user decided.

Step 6: Finish

git diff --check for leftover markers.
Run typecheck/cargo check on the merged tree before producing the table — this is the backstop for silent symbol/field renames Step 3 missed. Pipe slow output to /tmp/pr-merge-check.out and grep. Treat any errors as additional rows in the table and fix them.
Show the table + git status. Do not commit or push — wait for the user.