Checking out a colleagues branch causes every commit to be edited (requiring a force push) #9410
Replies: 2 comments
-
Thanks so much for bringing this up! This has also been one of my pain-points.
Currently there is no fix, but it's planned to rewrite that functionality and make it behave must less intrusively so that at most the rebasing will be optional, and can only be done for fully local branches. The reasoning behind the current behaviour is to keep the forkpoint of the workspace in relation to the target branch, maybe also because it's stored in metadata and things went wrong when the effective forkpoint changed. |
Beta Was this translation helpful? Give feedback.
-
That's super unfortunate, since it makes GitButler unusable for collaborative work. :/ |
Beta Was this translation helpful? Give feedback.
Uh oh!
There was an error while loading. Please reload this page.
-
Hi,
whenever I apply a branch that is not mine (i.e. present on the remote, but not previously checked out on my machine, for example a colleagues branch), every commit in that branch is marked as having been edited and the "force push" button is enabled.
I only want to add a commit on top of the respective branch, not rewrite the whole history.
Why is this happening and how can I work around / fix this behavior?
Expected behavior: I apply the branch, I create a new commit on that branch, I push that commit (no force-push required)
Best regards
Beta Was this translation helpful? Give feedback.
All reactions