vlsi commented on pull request #2628:
URL: https://github.com/apache/calcite/pull/2628#issuecomment-988187161


   I think we have already discussed "when it is time to squash", and I believe 
the outcome is like "as soon as one thinks there's a final state, it is a good 
time to squash".
   
   AFAIK GitHub does show "force push" changes, so "force push" alone does not 
create problems for the review.
   
   However, there's a notable case: "rebase on top of current master and squash 
at the same time". That results in "combined diff" where both "changes from 
master branch" and "changes from the squash" appear in the same diff.
   
   In that case, I prefer to rebase first, force push, then squash and 
force-push again. It shows as two "force push" events in GitHub UI.


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: [email protected]

For queries about this service, please contact Infrastructure at:
[email protected]


Reply via email to