Add support for committing conflicts

sorenlouv / backport

A simple CLI tool that automates the process of backporting commits on a GitHub repo

https://github.com/sqren/backport/blob/main/docs/config-file-options.md

Apache License 2.0

241 stars 57 forks source link

Add support for committing conflicts #470

Closed sorenlouv closed 10 months ago

sorenlouv commented 10 months ago

Previously if the backport tool encountered conflicts it would allow the user to resolve them manually, or when running in non-interactive mode in CI it would abort. This PR introduces commitConflicts: boolean option. It is disabled by default. When enabled it will commit conflicting files when running on CI.