Add merge conflict action and update action version #995
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
The |
openbullet
reviewed
Jul 1, 2024
| with: | ||
| dirtyLabel: 'merge-conflict' | ||
| commentOnDirty: 'This pull request has merge conflicts. Please resolve the conflicts so the PR can be successfully reviewed and merged.' | ||
| repoToken: '${{ secrets.GITHUB_TOKEN }}' |
There was a problem hiding this comment.
There is no such secret at the moment in the repo, is it something that is automatically defined or do I have to create a fine-grained token? Do you have more information on this?
There was a problem hiding this comment.
- To follow your previous comment should I remove the publish.yaml ? (Edit: did removed the change in the publish.yaml)
- The token is automatically created by Github, no need to setup anything more than just the
merge-conflictlabel
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Added a merge conflict labeler workflow for all the PR when a merge conflict is detected so people can resolve it when commit on master branch is made.
And update action version to remove the warning.
merge-conflictlabel need to be made before merging this PR