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

feat: Add merge conflict labeler workflow #4694

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

Gauvino
Copy link

@Gauvino Gauvino commented Apr 19, 2024

⚠️⚠️⚠️ Since we do not accept all types of pull requests and do not want to waste your time. Please be sure that you have read pull request rules:
https://github.com/louislam/uptime-kuma/blob/master/CONTRIBUTING.md#can-i-create-a-pull-request-for-uptime-kuma

Tick the checkbox if you understand [x]:

  • I have read and understand the pull request rules.

Description

Before merging the PR you have to manually add the label merge conflict

Put a label merge conflict on PR with merge conflict and comment also to say to the maintainer that PR as merge conflict.

Would be simpler to review PR and also gain time cause when merge conflict is detected the maintainer can solve it so you don't have to say to him manually to solve the merge conflict.

Checklist

  • My code follows the style guidelines of this project
  • I ran ESLint and other linters for modified files
  • I have performed a self-review of my own code and tested it
  • I have commented my code, particularly in hard-to-understand areas (including JSDoc for methods)
  • My changes generates no new warnings
  • My code needed automated testing. I have added them (this is optional task)

@CommanderStorm
Copy link
Collaborator

I don't think this would add value for my workflow.

Merging PRs is not much of the work required unless there have been other competing PRs such as in the case in this example:

In the case where it is significant work, that would have to be done by the PR-author though for scalabiltiy... => That would need a comment anyway..

@Gauvino
Copy link
Author

Gauvino commented Apr 20, 2024

No problem then, if you don't think you need this, just wanted to help the project, because it would certainly make you gain time by not having to say everytime there is a conflict on a PR to solve it and also do some triage.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants