Merge pull request #7 from michael-wisely-gravwell/visible-conflicts

feat: More visible conflicts
gravwell · Aug 15, 2024 · d6a62bc · d6a62bc
2 parents 6995663 + 337a6e7
commit d6a62bc
Show file tree

Hide file tree

Showing 5 changed files with 539 additions and 193 deletions.
diff --git a/README.md b/README.md
@@ -17,6 +17,8 @@ Use this Action to automatically open PRs from a given pattern of source branch
 | `target_pattern`          | The branch (or pattern) to use for the PR target (base).                                                                                                                                                                                                                                                                                                                                                                                                                    | Yes      |
 | `pr_title`                | A mustache-templated string to use to construct the PR title                                                                                                                                                                                                                                                                                                                                                                                                                | No       |
 | `pr_body`                 | A mustache-templated string to use to construct the PR body                                                                                                                                                                                                                                                                                                                                                                                                                 | No       |
+| `source_conflict_label`   | A label to apply when a conflict is detected between the source branch and intermediate branch. Not relevant if there's no intermediate branch. If omitted, then no labels will be applied                                                                                                                                                                                                                                                                                  | No       |
+| `target_conflict_label`   | A label to apply when a conflict is detected between the intermediate branch and the target branch. If not using an intermediate branch, this label will be applied if there is a conflict between the source branch and target branch. If omitted, then no labels will be applied.                                                                                                                                                                                         | No       |
 
 ### Intermediate Branches
 

diff --git a/action.yml b/action.yml
@@ -16,7 +16,7 @@ inputs:
     required: true
     description: |
       Set to false to open PRs directly from source branches to target branches.
-      
+
       Set to true to merge the source and target branches into an intermediate branch, and open a PR from the intermediate branch to the target branch.
       Intermediate branches are automatically updated whenever the source branch or target branch is updated.
       Intermediate branches are useful when branch protections require the head (source) branch be up-to-date with the base (target) branch.
@@ -35,6 +35,12 @@ inputs:
       This PR addresses no issue.
 
       It proposes merging `{{{ original_source }}}` into `{{{ target }}}`{{#use_intermediate_branch}} via `{{{ source }}}`{{/use_intermediate_branch}}.
+  source_conflict_label:
+    description: |
+      A label to apply when a conflict is detected between the source branch and intermediate branch. Not relevant if there's no intermediate branch. If omitted, then no labels will be applied
+  target_conflict_label:
+    description: |
+      A label to apply when a conflict is detected between the intermediate branch and the target branch. If not using an intermediate branch, this label will be applied if there is a conflict between the source branch and target branch. If omitted, then no labels will be applied.
 outputs:
   syncedPRs:
     description: |