Skip to content

Check the changed files and block a Pull Request if the merge conflict markers are found.

License

Notifications You must be signed in to change notification settings

sv-tools/block-merge-conflicts

Use this GitHub action with your project
Add this Action to an existing workflow or create a new one
View on Marketplace

Folders and files

NameName
Last commit message
Last commit date

Latest commit

 

History

36 Commits
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 

Repository files navigation

block-merge-conflicts

Check the changed files and block a Pull Request if the merge conflict markers are found.

The action uses GitHub API to get the list of changed files

Inputs

token

Required GitHub Token.

Example

- uses: actions/checkout@v3
- uses: sv-tools/block-merge-conflicts@v1
  with:
    token: ${{ secrets.GITHUB_TOKEN }}

About

Check the changed files and block a Pull Request if the merge conflict markers are found.

Resources

License

Stars

Watchers

Forks

Packages

No packages published