Skip to content

InfiniteTeam/action-conflict-finder

 
 

Folders and files

NameName
Last commit message
Last commit date

Latest commit

 

History

48 Commits
 
 
 
 
 
 
 
 
 
 
 
 
 
 

Repository files navigation

Merge Conflict Finder

This action finds any merge conflicts in your repository.

Sometimes we accidentally resolve merge conflicts without actually resolving it, this action simply finds if we have any instances of files with merge conflicts we didn't resolve and reports them.

How to use it?

This is a Github action, so it has to be added to a github workflow.
A simple example of running this action on all pushes to the repository would be add a main.yml file under .github/workflows with the following content

on: [push]

jobs:
  merge_conflict_job:
    runs-on: ubuntu-latest
    name: Find merge conflicts
    steps:
      # Checkout the source code so we have some files to look at.
      - uses: actions/checkout@v2
      # Run the actual merge conflict finder
      - name: Merge Conflict finder
        uses: olivernybroe/[email protected]

On each push, it will now run the merge conflict finder

Excludes

You can add custom excludes to the search through the following inputs:

exclude_dir

A comma separate list of directories to ignore. The .git folder is always ignored

excludes

A comma separated list of files to ignore. Supports wildcard matching.

A workflow with the inputs could look like:

on: [push]

jobs:
  merge_conflict_job:
    runs-on: ubuntu-latest
    name: Find merge conflicts
    steps:
      # Checkout the source code so we have some files to look at.
      - uses: actions/checkout@v2
      # Run the actual merge conflict finder
      - name: Merge Conflict finder
        uses: olivernybroe/[email protected]
        with:
          exclude_dir: "path/to/ignore,path/to/ignore2"
          excludes: "ignore.me,*.zip"

About

A Github action for finding merge conflicts

Resources

License

Stars

Watchers

Forks

Releases

No releases published

Packages

No packages published

Languages

  • Shell 83.5%
  • Dockerfile 16.5%