Skip to content

Commit 9fdb7d6

Browse files
committed
Add some more information to COMMITTERS.adoc
1 parent ba4bb39 commit 9fdb7d6

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

COMMITTERS.adoc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@ While not absolute, here is some advice:
3737
look if interested.
3838
If the PR is very large or is a new extension, better let it
3939
bake for a few days.
40-
* We do _merge commits_ so please ask the author to properly squash the commits before merging (when it makes sense).
40+
* A pull request may not contain _merge commits_ (it makes backporting a lot harder) or `fixup!` commits.
41+
* We merge pull requests with _merge commits_ so please ask the author to properly squash the commits before merging (when it makes sense).
4142
The idea is to have proper semantic commits. Several commits are not a problem as long as they have a proper semantic.
4243
If the author is not familiar with Git or not available, you can also (carefully)
4344
https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/committing-changes-to-a-pull-request-branch-created-from-a-fork[do it for them]

0 commit comments

Comments
 (0)