We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
There was an error while loading. Please reload this page.
1 parent 0a11dc1 commit 0207a63Copy full SHA for 0207a63
.github/workflows/backport.yml
@@ -51,3 +51,10 @@ jobs:
51
52
relates to ${issue_refs}
53
original author: @${pull_author}
54
+
55
+ # Optional
56
+ # Specifies how the action will handle a conflict occurring during the cherry-pick.
57
+ # In all cases, the action will stop the cherry-pick at the first conflict encountered.
58
+ # When set to draft_commit_conflicts the backport will always create a draft pull request
59
+ # with the first conflict encountered committed.
60
+ conflict_resolution: draft_commit_conflicts
0 commit comments