diff options
| -rw-r--r-- | CONTRIBUTING.rst | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index 8d4abf979..72a0bd116 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -128,6 +128,12 @@ If a commit in your branch modifies behavior such that a test must also be changed to match the new behavior, then the tests should be updated with the same commit, so that every commit passes its own tests. +These principles apply whenever a branch is non-WIP. So for example, don't push +'fixup!' commits when addressing review comments, instead amend the commits +directly before pushing. GitLab has `good support +<https://docs.gitlab.com/ee/user/project/merge_requests/versions.html>`_ for +diffing between pushes, so 'fixup!' commits are not necessary for reviewers. + Commit messages ~~~~~~~~~~~~~~~ |