Resolve Backport Conflicts

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.

frappe Updated

File contents

frappe/skills commit e68b03b6b8

Frequently asked questions

npx get-skill add frappe/resolve-backport-conflicts