Skip to content

Commit e9ecab4

Browse files
authored
Clarify rebasing/merging guidelines in docs (bytecodealliance#9931)
Indicate that a rebase is required if there's a merge conflict or CI issues for example. Inspired by discussion on bytecodealliance#9897
1 parent fc7ef8d commit e9ecab4

File tree

1 file changed

+9
-2
lines changed

1 file changed

+9
-2
lines changed

docs/contributing-development-process.md

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,15 @@ Once someone has reviewed your PR, it's easier for us if you _don't_ rebase it
5252
when making further changes. Instead, at that point we prefer that you make new
5353
commits on top of the already-reviewed work.
5454

55-
That said, sometimes we may need to ask you to rebase for various technical
56-
reasons. If you need help doing that, please ask!
55+
That said rebasing (or merging from `main`) may still be required in situations
56+
such as:
57+
58+
* Your PR has a merge conflict with the `main` branch.
59+
* CI on your PR is failing for unrelated reasons and a fix was applied to `main`
60+
which needs to be picked up on your branch.
61+
* Other miscellaneous technical reasons may cause us to ask for a rebase.
62+
63+
If you need help rebasing or merging, please ask!
5764

5865
### Review and merge
5966

0 commit comments

Comments
 (0)