1 | # Managing pull requests
|
2 |
|
3 | You should:
|
4 |
|
5 | - use [GitHub reviews](https://help.github.com/articles/about-pull-request-reviews/)
|
6 | - review against the [Developer guide criteria](../developer-guide/rules.md)
|
7 | - resolve conflicts by [rebasing](https://www.atlassian.com/git/tutorials/rewriting-history/git-rebase)
|
8 | - assign _one or more_ [`pr: needs *`](https://github.com/stylelint/stylelint/labels) labels when requesting a change
|
9 |
|
10 | You should not use:
|
11 |
|
12 | - any other labels
|
13 | - any milestones
|
14 |
|
15 | ## Merging
|
16 |
|
17 | To merge a pull request, it must have at least:
|
18 |
|
19 | - one approval for simple documentation fixes
|
20 | - two approvals for everything else
|
21 |
|
22 | When merging a PR, you should:
|
23 |
|
24 | 1. ["Squash and merge"](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/about-pull-request-merges#squash-and-merge-your-pull-request-commits) commits and ensure the resulting commit message is:
|
25 | - descriptive
|
26 | - sentence case
|
27 | 2. Update the [changelog](https://github.com/stylelint/stylelint/blob/master/CHANGELOG.md) directly via the [GitHub website](https://github.com/stylelint/stylelint/edit/master/CHANGELOG.md) for everything except refactoring and documentation changes:
|
28 | 1. Create a `## Head` heading if one does not exist already.
|
29 | 2. Prefix the item with either: "Removed", "Changed", "Deprecated", "Added", or "Fixed".
|
30 | 3. Order the item within the group by the widest-reaching first to the smallest, and then alphabetically by rule name.
|
31 | 4. Suffix the item with the relevant pull request number, using the complete GitHub URL so that it works on [the website](https://stylelint.io/CHANGELOG/).
|
32 | 5. If applicable, lead the item with the name of the rule, e.g. "Fixed: `unit-blacklist` false positives for SCSS nested properties".
|
33 | 3. Post this update as a comment to the pull request.
|