|
For my repos, I tend to rebase people's changes onto main instead of creating a merge commit. Sometimes I go for a squash and merge or squash and rebase. Is there a recommended way to go about this? Directly rebasing or squashing errors due to the commit being immutable - is that just something you should ignore? I ended up duping the branch and then squashing into a new commit on top of main but it felt a little clunky and I'm wondering if I'm just missing something obvious. I couldn't find any discussions on this, but I might just be blind because this seems like it'd be a pretty common thing. |
Replies: 2 comments 1 reply
|
To manually land other people's changes via rebasing you currently need to add their fork and fetch the specific bookmark to land it. The same procedure is required for both merging and squash merging. |
|
Is the commit immutable because you're not tracking the remote bookmark? If so, track it with If that's not it, there's a |
Is the commit immutable because you're not tracking the remote bookmark? If so, track it with
jj bookmark track foo@originand it should become mutable.If that's not it, there's a
why_immutablerevset alias that can help figure out what's making the commits immutable.