Skip to content

merge-conflicts label #26

@nelsonic

Description

@nelsonic

Ideally there would never be any merge conflicts in projects and everyone would be happy,
but sadly, quite often on larger projects (more than one pair of developers)
we get merge conflicts in Pull Requests.

what do people think about having a merge-conflicts label
for this so Reviewers/QA never has to (manually) write out:

"please resolve merge conflicts on this PR ..."

and everyone understands what it means when this label is applied to a PR...?

"DWYLBOT" 🤖 Automation Enhancement:

when an event happens on a pull request (e.g. new commit pushed or assignment changed etc.)
we should check all Open Pull requests on the repository for Merge Conflicts...

image

And based on the existence of merge conflicts:

  • the merge-conflicts label should be applied and
  • the PR should be assigned back to the person who created the PR.

Metadata

Metadata

Assignees

Labels

T25mTime Estimate 25 Minutesawaiting-reviewAn issue or pull request that needs to be revieweddiscussShare your constructive thoughts on how to make progress with this issueenhancementNew feature or enhancement of existing functionalityhelp wantedIf you can help make progress with this issue, please comment!

Type

No type

Projects

No projects

Milestone

No milestone

Relationships

None yet

Development

No branches or pull requests

Issue actions