[PATCH] D150594: docs/GitHub: Add note about force-pushing when rebasing on main

Mehdi AMINI via Phabricator via llvm-commits llvm-commits at lists.llvm.org
Mon May 15 10:38:37 PDT 2023


mehdi_amini added inline comments.


================
Comment at: llvm/docs/GitHub.rst:40
+track the context of previous review comments.  However, if you are rebasing
+your changes on the latest main branch, then your only option is to force push.
 
----------------
Is this an opportunity to squash? Does GitHub preserve better the history if we force-push on rebase but don't squash?

The issue with this way of adding "fix up" commits is that a conflict during rebase may lead to as many redundant manual conflict resolution as there are "fix up" commits.


Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D150594/new/

https://reviews.llvm.org/D150594



More information about the llvm-commits mailing list