diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 39e4ef03fbf..b66694c1618 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -80,9 +80,9 @@ cd timescaledb repeating the commit message is preferred, which is done automatically by GitHub when it creates the pull request. - * Rebase your local feature branch against main (`git fetch origin`, - then `git rebase origin/main`) to make sure you're - submitting your changes on top of the newest version of our code. + * Rebase your local feature branch against main (`git fetch origin`, then `git rebase origin/main`) to make sure you're submitting your changes on top of the newest version of our code. + + * When finalizing your PR (i.e., it has been approved for merging), aim for the fewest number of commits that make sense. That is, squash any "fix up" commits into the commit they fix rather than keep them separate. Each commit should represent a * When finalizing your PR (i.e., it has been approved for merging), aim for the fewest number of commits that