skills.homes logoskills.homescapability registry
home/categories/containers/scylladb-scylla-cluster-tests-skills-fix-backport-conflicts-skill-md
cd ..
containersdevops

fix-backport-conflicts

Fix inline merge conflict markers in backport PRs by resolving conflicts and recommitting cleanly with original metadata preserved. Use when a backport PR has unresolved conflict markers, a cherry-pick produced merge conflicts, or a PR has the 'conflicts' label and needs to be made ready for review. Supports bulk mode for multiple PRs.

Ver código-fontecontainers
scylladb
maintainer
scylladb
Atualizado 3/29/2026
Estrelas
73
Forks
110
quick start

Installation and usage

Fix inline merge conflict markers in backport PRs by resolving conflicts and recommitting cleanly with original metadata preserved. Use when a backport PR has unresolved conflict markers, a cherry-pick produced merge conflicts, or a PR has the 'conflicts' label and needs to be made ready for review. Supports bulk mode for multiple PRs.

Instalação
$ install --globalskills.sh
Uso

Depois de instalar, você pode usar esta skill executando o seguinte comando no terminal:

skills use fix-backport-conflicts