diff options
| author | mergify[bot] | 2022-05-12 19:40:03 +0000 |
|---|---|---|
| committer | GitHub | 2022-05-12 19:40:03 +0000 |
| commit | 1eb26ffa4dba6fc00f77e37ee7db681f92059807 (patch) | |
| tree | dbadce3acabb4266f75f13ee011c5ea9b0687582 | |
| parent | 1ee9adbec48bc8393e1c3d0ed86a548f8510d13f (diff) | |
Update CONTRIBUTING.md for backport cleanup process (backport #2523) (#2524)
* Update CONTRIBUTING.md with backport cleanup process (#2523)
(cherry picked from commit ac19ff70458959e795933c7aad6bab88a16fcf5d)
# Conflicts:
# CONTRIBUTING.md
* Resolve conflicts
Co-authored-by: Megan Wachs <megan@sifive.com>
Co-authored-by: Jack Koenig <koenig@sifive.com>
| -rw-r--r-- | CONTRIBUTING.md | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 06b5200f..8e51fa0c 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -12,5 +12,6 @@ 5. You can peruse the [good-first-issues](https://github.com/chipsalliance/chisel3/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22) for easy tasks to start with. Another easy thing to start with is doing your own pass of the [website](https://www.chisel-lang.org/chisel3/docs/introduction.html) looking for typos, pages missing their titles, etc. The sources for the website are [here](https://github.com/chipsalliance/chisel3/tree/master/docs). -6. Please make your PRs against the `master` branch. The project admins, when reviewing your PR, will decide which stable version (if any) your change should be backported to. The backports will be opened automatically on your behalf and you may need to do some cleanup, but focus first on your `master` PR. +6. Please make your PRs against the `master` branch. The project admins, when reviewing your PR, will decide which stable version (if any) your change should be backported to. The backports will be opened automatically on your behalf once your `master` PR is merged. +7. If your backport PR(s) get labeled with `bp-conflict`, it means they cannot be automatically be merged. You can help get them merged by openening a PR against the already-existing backport branch (will be named something like `mergify/bp/3.5.x/pr-2512`) with the necessary cleanup changes. The admins will merge your cleanup PR and remove the `bp-conflict` label if appropriate. |