Skip to content
git-pull-request

GitHub Action

conflibot

v1.2.0 Latest version

conflibot

git-pull-request

conflibot

Check and warn if a Pull Request will conflict with another Pull Request when they get merged

Installation

Copy and paste the following snippet into your .yml file.

              

- name: conflibot

uses: wktk/conflibot@v1.2.0

Learn more about this action in wktk/conflibot

Choose a version

conflibot

Check and warn if a Pull Request will conflict with another Pull Request when they get merged.

Configuration

name: conflibot
on: pull_request_target

jobs:
  conflibot:
    runs-on: ubuntu-latest
    steps:
      - uses: actions/checkout@v3
      - name: Warn potential conflicts
        uses: wktk/conflibot@v1
        with:
          github-token: ${{ secrets.GITHUB_TOKEN }}
          exclude: |
            yarn.lock
            **/*.bin

Inputs

  • github-token required: GitHub API token with write access to the repo
  • exclude: Ignored path patterns in newline-separated glob format

Screenshots