olivernybroe / action-conflict-finder Goto Github PK

GitHub Actions has support for reporting an error on a file, so it can be seen directly in changed files.
This will make it even quicker to find where the merge conflict was accidentally merged in.

https://help.github.com/en/actions/reference/workflow-commands-for-github-actions#setting-an-error-message

Better to create a separate workflow to perform this verification or create a test-only one and add it? Any suggestion?

Say foo symlinks to a directory that does not exist before compilation, and my compilation CI is not on GitHub Actions, then checkout followed by conflict finder fails with:

grep: ./foo: No such file or directory

Is it worth excluding symlinks by default?

We should change the docker container to use an alpine image for saving storage