Skip to content
Agentmart
Submit a tool

git-merge-resolver

Use before merges, during conflicted merges or rebases, when resolving conflict markers, or when deciding whether to continue or abort a Git operation.

Skill by SofianeBel

IndexedMIT
Write a review

Install

Works with Claude Code, Claude apps, Codex, Cursor, Gemini CLI, GitHub Copilot, VS Code, OpenCode, Goose, Windsurf. Read the repository before you give any tool access to your data.

npx agentmarket install skill/sofianebel-git-merge-resolver

Asks which of your tools to add it to (Claude Code, Codex, Cursor, VS Code, Windsurf, Gemini CLI, Claude Desktop) and shows the change first. See https://agentmart.dev/cli.

Get the weekly diff

The weekly diff: one email a week with new agent tools, notable updates and grade changes, plus security alerts for tools you follow. Double opt-in, one-click unsubscribe.

We use your email only for this newsletter. Privacy

About

Use before merges, during conflicted merges or rebases, when resolving conflict markers, or when deciding whether to continue or abort a Git operation.

Reviews

Write a review

No reviews yet. Installed it? Reviews come from verified installers only. How reviews work

Permissions

What this skill can do and what it asks for, from its SKILL.md. Checked Oct 25, 2026.

Tools
No tools found
Secrets
None asked for
Install scripts
None found

Network hosts it talks to 1

  • codeload.github.com · found in install command

Files it touches

  • ~/.claude/skills/git-merge-resolver

What's inside

Skill name
git-merge-resolver
Description
Use before merges, during conflicted merges or rebases, when resolving conflict markers, or when deciding whether to continue or abort a Git operation.
License
MIT
Instructions
31 lines in SKILL.md · view on GitHub

Files (1)

  • SKILL.md

SKILL.md (first lines)

# Git Merge Resolver

## Before merge

Run:

```powershell
node <plugin-root>\scripts\git-bible.mjs merge-check <target>
```

## During conflicts

Run:

```powershell
node <plugin-root>\scripts\git-bible.mjs conflicts
```

## Rules

- Resolve one file at a time.
- Explain ours/theirs relative to merge or rebase.
- Run `git diff --check` before staging resolved files.
- Stage exact resolved paths.
- Continue only after conflicts are gone and tests/checks are appropriate.

## Approval gates

Ask before aborting, resetting, checking out ours/theirs globally, or rewriting history.

From SofianeBel/git-bible, MIT.

More from SofianeBel/git-bible

Signals

Stars
0
Forks
0
Open issues
0
Last commit (this folder)
Jun 15, 2026 (4 months ago)

From GitHub (fetched Oct 24, 2026).

Details

License
MIT
Repository
github.com/SofianeBel/git-bible
First seen
Oct 24, 2026
Last checked
Oct 24, 2026
Source
GitHubgithub-graphql

More from SofianeBel

Cite this page

git-merge-resolver skill. Agent Mart. https://agentmart.dev/skills/sofianebel-git-merge-resolver (last updated 2026-10-24)