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
Is your feature request related to a problem? Please describe.
I have various old branches for which some commits have been merged to master, or rather, commits with identical changes but with different commit ids (e.g. because they were rebased or the commit message was edited in their PR phase). This is not a problem with git, because it detects identical commits during a rebase and skips them.
With jj rebase -d master these commits cause a bunch of conflicts, because they no longer apply cleanly on top of master.
Describe the solution you'd like
jj should do the same as git and detect duplicates and drop them (or maybe keep as empty unless --skip-empty is given) rather than creating conflicted changes.
Describe alternatives you've considered
Search manually for which changes are actually still needed, which is tedious and error prone.
The text was updated successfully, but these errors were encountered:
Is your feature request related to a problem? Please describe.
I have various old branches for which some commits have been merged to master, or rather, commits with identical changes but with different commit ids (e.g. because they were rebased or the commit message was edited in their PR phase). This is not a problem with git, because it detects identical commits during a rebase and skips them.
With
jj rebase -d master
these commits cause a bunch of conflicts, because they no longer apply cleanly on top of master.Describe the solution you'd like
jj should do the same as git and detect duplicates and drop them (or maybe keep as empty unless
--skip-empty
is given) rather than creating conflicted changes.Describe alternatives you've considered
Search manually for which changes are actually still needed, which is tedious and error prone.
The text was updated successfully, but these errors were encountered: