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

[Tom Stellard via Phabricator via llvm-commits]

tstellar created this revision.
tstellar added reviewers: mehdi_amini, ldionne, jhenderson.
Herald added a project: All.
tstellar requested review of this revision.
Herald added a project: LLVM.

Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D150594

Files:
  llvm/docs/GitHub.rst


Index: llvm/docs/GitHub.rst
===================================================================
--- llvm/docs/GitHub.rst
+++ llvm/docs/GitHub.rst
@@ -36,7 +36,8 @@
 ^^^^^^^^^^^^^^^^^^^^^^
 When updating a pull request, you should push additional "fix up" commits to
 your branch instead of force pushing.  This makes it easier for GitHub to
-track the context of previous review comments.
+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.
 
 If you do this, you must squash and merge before committing and
 you must use the pull request title and description as the commit message.


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D150594.522251.patch
Type: text/x-patch
Size: 691 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20230515/e26bfb84/attachment.bin>