You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
In our repo we have a next branch which is automatically generated by an automation - all PRs with a "staging" label get merged into the next branch and deployed (note that the next branch is purely used for automating deploy previews, developers don't ever touch it or branch of it themselves)
If one of my branches gets merged into next then by default jj treats it as immutable and won't let me squash/rebase by default
So I updated my config.toml to make the branch mutable:
Which works fine, but then when I make changes my commits are highlighted red and marked with a ?? as jj seems to detect the change id has multiple commits associated (one on my branch and another on the next branch)
Ideally I'd prefer jj to just ignore the next@origin branch when it came to immutability and duplicate commit ids, but can't seem to find a good way to do so?
reacted with thumbs up emoji reacted with thumbs down emoji reacted with laugh emoji reacted with hooray emoji reacted with confused emoji reacted with heart emoji reacted with rocket emoji reacted with eyes emoji
Uh oh!
There was an error while loading. Please reload this page.
Uh oh!
There was an error while loading. Please reload this page.
-
next
branch which is automatically generated by an automation - all PRs with a "staging" label get merged into thenext
branch and deployed (note that thenext
branch is purely used for automating deploy previews, developers don't ever touch it or branch of it themselves)next
then by default jj treats it as immutable and won't let me squash/rebase by defaultconfig.toml
to make the branch mutable:??
as jj seems to detect the change id has multiple commits associated (one on my branch and another on thenext
branch)Ideally I'd prefer jj to just ignore the
next@origin
branch when it came to immutability and duplicate commit ids, but can't seem to find a good way to do so?Discussion on discord: https://discord.com/channels/968932220549103686/968932220549103689/1394275351839903818
Beta Was this translation helpful? Give feedback.
All reactions