メニュー
Resolve merge conflicts in a Mergify backport pull request. When a cherry-pick fails, Mergify commits the conflict markers as they are. This skill takes a pull request link or number as an argument.
デフォルトでは、最初にソースを確認する Prompt が選択されています。直接コマンドに切り替えるか、ローカルコピーをダウンロードすることもできます。
インストールを決める前に、SKILL.md と SkillsMP に表示されている付属ファイルをお読みください。
Codex または Claude でインストール この Prompt をコピーして Codex、Claude、または他のアシスタントに貼り付けると、Skill ページを確認してインストールできます。
直接コマンドでは確認用 Prompt が省略されます。実行前にソースを確認してください。
npx skills add https://github.com/frappe/skills --skill resolve-backport-conflictsコマンドは1行のまま表示されます。コピー前に横へスクロールして全体を確認してください。
ローカルで確認しますか？SkillsMP が現在取得できるファイルをダウンロードできます。
SOC 職業分類に基づく
SKILL.md を表示中
| name | resolve-backport-conflicts |
| description | Resolve merge conflicts in a Mergify backport pull request. When a cherry-pick fails, Mergify commits the conflict markers as they are. This skill takes a pull request link or number as an argument. |
| disable-model-invocation | true |
Mergify backports a pull request with a cherry-pick. When the cherry-pick conflicts, Mergify runs git add on the conflicted files and commits them unresolved. The branch then holds raw conflict markers:
<<<<<<< HEAD
content of the target branch, such as version-16-hotfix
=======
content of the commit under backport
>>>>>>> <sha> (commit subject)
The HEAD side is the target branch. The >>>>>>> side is the pull request under backport. Neither side wins by default.
Work inside the repository that owns the pull request. If the current directory is a different repository, clone the correct one into the scratchpad directory.
gh pr view <pr-url> --json number,title,body,baseRefName,headRefName,headRepositoryOwner,url
gh pr checkout <pr-url> --force
The --force flag resets a stale local branch to the pull request head. If the working tree is dirty, stop and tell the user. Do not discard the work of the user.
The Mergify description holds the line This is an automatic backport of pull request #<N>. Read the number from that line. If the line is absent, read the number from the branch name .
mergify/bp/<branch>/pr-<N>gh pr view <N> --json title,body,url
gh pr diff <N>
This diff states the intent of the backport. Read all of it before you edit a file.
git grep -nE '^(<{7}|={7}|>{7})' -- . || echo "no markers"
git diff HEAD~1 --stat
git log -1 --format=%s
The last command confirms that HEAD is the conflict commit of Mergify. Look also for leftover .rej and .orig files.
Step 4 matters most. A conflict hunk drags in unrelated work from later commits on the source branch. Renamed helpers, new APIs, and unrelated refactors arrive this way. None of them belong in a release branch.
If the backport needs a function or a module that the target branch does not have, do not write a replacement. Report the gap and ask the user how to continue.
Mergify also stages clean hunks that belong to other commits. To catch these, compare the whole conflict commit against the diff of the original pull request. Revert the hunks that do not match.
git grep -nE '^(<{7}|={7}|>{7})' -- .
git diff HEAD
The first command must print nothing. Read every line that the second command prints. Compare git diff HEAD~1 against gh pr diff <N>. Apart from branch differences, the two diffs must match.
If the repository has a linter or a formatter, run it on the files you changed.
git add <modified files>
git commit -m "chore: resolve conflict"
git push <remote> HEAD:<headRefName>
To choose the remote, match headRepositoryOwner from step 1 against the output of git remote -v. A Mergify branch lives on the upstream repository, not on a fork. Never force-push.
conflicts labelMergify adds a conflicts label when the cherry-pick fails. The label stays until someone removes it. After the push succeeds, and only if no marker remains, remove it:
gh pr edit <pr-url> --remove-label conflicts
The command fails if the pull request does not carry the label. That failure is harmless. If you could not resolve every conflict, leave the label in place.
Report these points to the user:
State the facts. If a resolution is a judgment call, say so.