Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Action to add label to PR on merge conflict #621

Merged
merged 1 commit into from
Dec 20, 2023

Conversation

GeckoEidechse
Copy link
Member

@GeckoEidechse GeckoEidechse commented Dec 20, 2023

Adds a GitHub Action that auto-adds a label to a PR in case there are merge conflicts.

Action in use is https://github.com/marketplace/actions/auto-label-merge-conflicts

I'm not sure if the label also gets auto-removed again but I guess we'll find out :P

Adds a GitHub Action that auto-adds a label to a PR in case there are merge conflicts.
@GeckoEidechse GeckoEidechse added the feedback wanted Feedback is wanted whether the changes by this PR are desired label Dec 20, 2023
@GeckoEidechse
Copy link
Member Author

For obvious reasons there isn't anything to test or code review here, so instead just react to the PR with a 👍 or 👎 if you want it or not.

@ASpoonPlaysGames
Copy link
Contributor

I'm not sure if the label also gets auto-removed again but I guess we'll find out :P

https://github.com/mschilde/auto-label-merge-conflicts/blob/591722e97f3c4142df3eca156ed0dcf2bcd362bd/lib/main.ts#L145-L150 should do

Copy link
Contributor

@ASpoonPlaysGames ASpoonPlaysGames left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I like this, automation is good.

I guess we kinda have to test this in production, so uhhh
fuck it, we ball

@GeckoEidechse GeckoEidechse merged commit bb8ed59 into main Dec 20, 2023
5 checks passed
@GeckoEidechse GeckoEidechse deleted the ci/auto-add-merge-conflict-label branch December 20, 2023 15:03
uniboi pushed a commit to uniboi/NorthstarLauncher that referenced this pull request Dec 21, 2023
Adds a GitHub Action that auto-adds a label to a PR in case there are merge conflicts.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
feedback wanted Feedback is wanted whether the changes by this PR are desired
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

None yet

2 participants