home/categories/containers/scylladb-scylla-cluster-tests-skills-fix-backport-conflicts-skill-md
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.

scylladb
maintainer
scylladb
Обновлено 3/29/2026
Звёзды
73
Форки
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.

Установка
$ install --globalskills.sh
Использование

После установки вы можете использовать этот skill, выполнив следующую команду в терминале:

skills use fix-backport-conflicts