diff --git a/src/content/docs/basic-git-workflow.mdx b/src/content/docs/basic-git-workflow.mdx index 7ee39c80..dee90c62 100644 --- a/src/content/docs/basic-git-workflow.mdx +++ b/src/content/docs/basic-git-workflow.mdx @@ -226,7 +226,7 @@ Follow these steps: :::caution -Do not repeatedly merge the `main` branch into your feature branch. Every merge commit triggers another round of CI runs that we have to pay for, and it clutters your pull request history. When you need to update your branch with the latest changes from `upstream/main`, [rebase](https://git-scm.com/book/en/v2/Git-Branching-Rebasing) instead. Also make sure your existing commits are squashed into a small set of meaningful commits before opening (or updating) your pull request. +Do not repeatedly merge the `main` branch into your feature branch. Every time something is pushed to the branch it triggers another round of CI runs that we have to pay for, and it clutters your pull request history. You don't usually need to update your branch with the latest changes from `upstream/main`, but if you do it, to minimize the CI runs please push try to this update with other commits that are updating your PR.please bundle the push with other When you need to update your branch with the latest changes from `upstream/main`, [rebase](https://git-scm.com/book/en/v2/Git-Branching-Rebasing) instead. Also, please do not rewrite the history of the commits already reviewed, that makes it harder on reviewers to distinguish new changes from old ones. ::: ## Proposing a Pull Request (PR)