maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

docs(REVIEWS): mention use of merge commits in gerrit intro

Browse source 
Change-Id: I15de6314171ad882786a95753a7c439b8998f900
Reviewed-on: https://cl.tvl.fyi/c/depot/+/13037
Reviewed-by: tazjin <tazjin@tvl.su>
Autosubmit: sterni <sternenseemann@systemli.org>
Tested-by: BuildkiteCI
This commit is contained in:
sterni 2025-01-21 21:33:34 +01:00 • committed by clbot
parent 55a7ec7b9d
commit 26edf809ff
1 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
docs/REVIEWS.md
View file

@ -100,11 +100,10 @@ git push origin HEAD:refs/for/canon%wip
``` ```
TIP: Every individual commit will become a separate change. We do not squash TIP: Every individual commit will become a separate change. We do not squash
related commits, but instead submit them one by one. Be aware that if you are related commits, but instead submit them one by one. If you need to add a
expecting a different behaviour and attempt something like an unsquashed subtree lot of commits to depot in one go, e.g. for importing a preexisting project,
merge, you will produce a *lot* of CLs (read [you can create a special merge commit][importing-projects]) under some
[how to import another project properly][importing-projects]). circumstances.
This is strongly discouraged.
During your review, the reviewer(s) might ask you to make changes. You can During your review, the reviewer(s) might ask you to make changes. You can
simply amend your commit(s) and push to the same ref. Gerrit will automatically simply amend your commit(s) and push to the same ref. Gerrit will automatically