================
@@ -124,6 +124,12 @@ New checks
   pointer and store it as class members without handle the copy and move
   constructors and the assignments.
 
+- New :doc:`bugprone-invalid-enum-default-initialization
----------------
NagyDonat wrote:

> LLVM documentation (https://llvm.org/docs/GitHub.html) actually tells that we 
> should rebase the PR after the review is finished, force push a final commit 
> and merge this on github.

The documentation primarily suggest using the "Squash and merge" button and 
only offers this "Merge using the GitHub command line interface" workflow (that 
you appear to summarize) as a secondary alternative. Also note that there is 
almost no difference between using "Squash and merge" and this CLI workflow.

> (But rebase can involve changes that should be reviewed?)

Yes, _some_ rebases can involve nontrivial changes, but the intended workflow 
is that:
- if the change is not yet compatible with the main branch (a rebase would 
involve nontrivial changes), then _merge_ the main branch to the PR branch, add 
the necessary correction commits and review them;
- once the change is complete and compatible with the main branch (i.e. it can 
be trivially rebased), it should be squashed and rebased (either by the 
slightly misnamed "Squash and merge" button, or the equivalent CLI workflow) -- 
and in this situation the rebase is trivial.

> Comparing changes between PR commits (like a diff only of the last update) 
> seems to be not possible after rebase.

Yes, that's a significant reason why rebases during the lifetime of the PR 
should be avoided.

> "Squash and merge" does work (if there is no conflict) and leaves a single 
> (non-merge) commit in the main branch.

Yes, it's a bit unfortunate that they called it "Squash and merge" instead of 
"Squash and rebase" (which would accurately describe its effects) -- but it 
works correctly.

https://github.com/llvm/llvm-project/pull/136823
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

Reply via email to