MCP.so
ログイン
Gitmanual

Merge Conflict Resolver

Rebase or merge target branch, resolve conflicts file by file, and loop until the branch is current and tests pass.

起動プロンプト

Start the "Merge Conflict Resolver" loop.

Goal: branch is rebased on main with no conflicts and tests pass
Max iterations: 8
Between iterations run: npm test
Exit when: rebase completes and tests exit 0

Step 1: Rebase on main. Resolve conflicts one file at a time, run tests, continue.

Self-pace this loop. After each iteration, run the check command, read the output, and only continue if the exit condition is not met. Stop when the exit condition passes or max iterations is reached. Give a short status update each pass.

基本情報

カテゴリ

Git

目標

branch is rebased on main with no conflicts and tests pass

最大反復回数

8

検査コマンド

npm test

退出条件

rebase completes and tests exit 0

対応エージェント

Cursor, Claude Code

手順

  1. 1

    Update branch

    Fetch latest main and attempt rebase or merge.

    git fetch origin && git rebase origin/main
  2. 2

    Resolve conflicts

    For each conflict, read both sides, preserve intent, and resolve with minimal changes.

  3. 3

    Verify

    Run tests after each resolution batch.

    npm test