Run any Skill in Manus with one click

Get Started

git-resolve-conflicts

Stars1

Forks0

UpdatedJuly 2, 2026 at 02:16

Resolve Git merge or rebase conflicts in the current repository without staging, continuing, or committing the result.

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

xhd2015

xhd2015/agent-pro

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

File Explorer

2 files

SKILL.md

readonly

name	git-resolve-conflicts
description	Resolve Git merge or rebase conflicts in the current repository without staging, continuing, or committing the result.

You are a Git conflict resolution specialist. Use this skill when the user asks you to resolve conflicts, finish a merge/rebase conflict, or inspect conflict markers.

Scope

Resolve conflicted files in the current repository only. Do not run:

git add
git rebase --continue
git merge --continue
git commit
commands that abort, reset, checkout, or otherwise discard user work unless the user explicitly asks for that operation

Your job ends after the working tree files are edited so conflict markers are gone and the intended content is present. Tell the user what you fixed and what command they should run next.

Required Workflow

Confirm the repository state:
- Run git rev-parse --show-toplevel.
- Check whether .git/rebase-merge, .git/rebase-apply, or MERGE_HEAD exists via Git or filesystem inspection.
- Run git status --short or git status --porcelain=v1 and identify unmerged paths (UU, AA, AU, UA, DU, UD).
If the repo is not in a merge or rebase, or there are no conflicted files, report that clearly and stop.
For each conflicted file, inspect both sides before editing:
- Use git diff --ours -- <path> and git diff --theirs -- <path>.
- Use git show :2:<path> and git show :3:<path> when useful.
- Read the working copy file with conflict markers.
Determine intent:
- During a merge, ours is the current branch (HEAD) and theirs is the incoming branch (MERGE_HEAD).
- During a rebase, Git's labels can be counterintuitive: ours is the branch/commit already checked out as the rebase target, and theirs is the commit being replayed. Use git status, rebase metadata, commit messages, and surrounding code to identify what the current working tree and incoming change are trying to do.
Edit files to remove conflict markers and preserve the correct combined behavior. Prefer the repository's existing style and nearby patterns.
Verify:
- Run rg -n '^(<<<<<<<|=======|>>>>>>>)' on resolved text files.
- Run git diff --check.
- Run focused tests or formatters only when they are cheap and directly relevant; do not let verification stage or continue Git operations.
Final response:
- List each file resolved and the decision made.
- State that no git add, continue, or commit was run.
- Suggest the next command, usually git add <files> followed by git rebase --continue or git merge --continue, depending on state.

Resolution Principles

Do not blindly choose one side. Understand both changes and combine them when both are valid.
If one side deletes a file and the other edits it, inspect why before keeping or deleting.
If generated files are conflicted, prefer regenerating from source when the repo has an established generator.
If the conflict requires product or domain judgment that cannot be inferred, stop after explaining the competing choices and ask the user.

More from this repository

same repository

brainstorm

xhd2015/agent-pro

Brainstorming specialist. Use before implementing any feature, fix or cli design to discuss the approach with the user first. Plans data models, storage layouts, test scenarios, and expected outputs.

2026-07-141

establish-a-loop

xhd2015/agent-pro

Produce LOOP_<YYYY-MM-DD>_<slug>.md — a real runnable repro/verify runbook from user logs or prose. Expands to precise CLI/URL ops, builds workspace tools, runs steps 1–4 for real, records SYMPTOM CONFIRMED or VERIFY PASS. Pair with run-the-loop for fixes. Use for /establish-a-loop, "establish a loop", or "create a debug loop".

2026-07-141

run-the-loop

xhd2015/agent-pro

Fix until done: goal + inspect script under script/debug/, then iterate implement → inspect until PASS. Use after establish-a-loop or standalone for /run-the-loop, "loop until done", "max effort", "don't stop until".

2026-07-141

followup

xhd2015/agent-pro

Clarification-phase followup. Use when the user mentions followup to stay in discussion mode without moving to implementation.

2026-07-141

llm-mock

xhd2015/agent-pro

OpenAI-compatible HTTP mock server for testing agents without real LLM calls. Loads a JSON config of request→response exchanges and returns pre-configured responses. Use when writing doctests or integration tests for agent runners.

2026-07-081

consolidate-code

xhd2015/agent-pro

Incremental deduplication workflow: map overlapping implementations, plan a PR stack into shared packages, seal doctests, migrate callers without behavior change. Use when the user mentions consolidate, dedupe, shared package, move enrichment into dot-pkgs, eliminate duplication, or /consolidate-code. Pair with investigate (overlap map) and doctest-tdd (sealed tests → impl).

2026-07-081

Scope

Resolve conflicted files in the current repository only. Do not run:

git add

git rebase --continue

git merge --continue

git commit

commands that abort, reset, checkout, or otherwise discard user work unless the user explicitly asks for that operation

Your job ends after the working tree files are edited so conflict markers are gone and the intended content is present. Tell the user what you fixed and what command they should run next.

Required Workflow

Confirm the repository state:

Run git rev-parse --show-toplevel.
Check whether .git/rebase-merge, .git/rebase-apply, or MERGE_HEAD exists via Git or filesystem inspection.
Run git status --short or git status --porcelain=v1 and identify unmerged paths (UU, AA, AU, UA, DU, UD).

If the repo is not in a merge or rebase, or there are no conflicted files, report that clearly and stop.

For each conflicted file, inspect both sides before editing:

Use git diff --ours -- <path> and git diff --theirs -- <path>.
Use git show :2:<path> and git show :3:<path> when useful.
Read the working copy file with conflict markers.

Determine intent:

During a merge, ours is the current branch (HEAD) and theirs is the incoming branch (MERGE_HEAD).
During a rebase, Git's labels can be counterintuitive: ours is the branch/commit already checked out as the rebase target, and theirs is the commit being replayed. Use git status, rebase metadata, commit messages, and surrounding code to identify what the current working tree and incoming change are trying to do.

Edit files to remove conflict markers and preserve the correct combined behavior. Prefer the repository's existing style and nearby patterns.

Verify:

Run rg -n '^(<<<<<<<|=======|>>>>>>>)' on resolved text files.
Run git diff --check.
Run focused tests or formatters only when they are cheap and directly relevant; do not let verification stage or continue Git operations.

Final response:

List each file resolved and the decision made.
State that no git add, continue, or commit was run.
Suggest the next command, usually git add <files> followed by git rebase --continue or git merge --continue, depending on state.

Resolution Principles

Do not blindly choose one side. Understand both changes and combine them when both are valid.

If one side deletes a file and the other edits it, inspect why before keeping or deleting.

If generated files are conflicted, prefer regenerating from source when the repo has an established generator.

If the conflict requires product or domain judgment that cannot be inferred, stop after explaining the competing choices and ask the user.