From 26edf809ffac167165fa6d29e82c3646564789db Mon Sep 17 00:00:00 2001 From: sterni Date: Tue, 21 Jan 2025 21:33:34 +0100 Subject: [PATCH] docs(REVIEWS): mention use of merge commits in gerrit intro Change-Id: I15de6314171ad882786a95753a7c439b8998f900 Reviewed-on: https://cl.tvl.fyi/c/depot/+/13037 Reviewed-by: tazjin Autosubmit: sterni Tested-by: BuildkiteCI --- docs/REVIEWS.md | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/docs/REVIEWS.md b/docs/REVIEWS.md index 8edb422e4..2bea3173a 100644 --- a/docs/REVIEWS.md +++ b/docs/REVIEWS.md @@ -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 -related commits, but instead submit them one by one. Be aware that if you are -expecting a different behaviour and attempt something like an unsquashed subtree -merge, you will produce a *lot* of CLs (read -[how to import another project properly][importing-projects]). -This is strongly discouraged. +related commits, but instead submit them one by one. If you need to add a +lot of commits to depot in one go, e.g. for importing a preexisting project, +[you can create a special merge commit][importing-projects]) under some +circumstances. 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