{"repo":"mschilde/auto-label-merge-conflicts","free":true,"listed":false,"github":"https://github.com/mschilde/auto-label-merge-conflicts","clone":"git clone https://github.com/mschilde/auto-label-merge-conflicts.git","description":"Github action to auto-label PRs with merge conflicts","language":"TypeScript","stars":46,"topics":["github-actions"],"license":"MIT","category":"workflow-automation","readme_excerpt":"auto-label-merge-conflicts A Github action to auto-label PRs with merge conflicts Purpose This action checks all open Pull Requests for merge conflicts and marks them with a Github label. Once a conflict is resolved the label is automatically removed. The typical use case is to run this action post merge (e.g. push to master ) to quickly see which other PRs are now in conflict. We use this setup e.g. on our monorepo at Comtravo. Instead of a grumpy CTO pinging developers to fix their merge conflicts there's now a shiny bot. Set up To configure the action on your repo you have to do 2 things: 1) pick a Github label that should be used to mark PRs with conflicts This label will then be managed by this action. It will be added to PRs with merge conflicts and removed from PRs without conflicts. 2) configure the new workflow by creating a YML config file in your .github/workflows folder: The label from step 1 should be referenced in the parameter CONFLICT LABEL NAME Take a look at this repo for an example setup. Arguments: CONFLICT LABEL NAME : label used for marking conflicts, note that such label has to exist in your repo MAX RETRIES : optional (default 5) WAIT MS : optional (default 5000) Limitations Github does not reliably compute the mergeable status which is used by this action to detect merge conflicts. If master changes the mergeable status is unknown until someone (most likely this action) requests it. Github then tries to compute the status with an async job. This is us","default_branch":null,"files":null,"tree":[],"storefront":"/r/mschilde","claimed":false,"request_supported":{"post":"https://gitbuyer.com/r/mschilde/auto-label-merge-conflicts/request-supported","requests":0},"note":"indexed from public GitHub; nothing is for sale on this page. Clone it from GitHub. Paid listings live at /search."}