EXAMPLE: Rewrite commit to multiple commits #3486
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Ilya reported this in #3483. The bug was introduced in 9763207. Before this fix, `jj split` dropped any parents what weren't involved in the split when it rebased the children of the commit being split. This meant that any children which were merge commits lost their other parents unintentionally. Fixes #3483
emesterhazy
force-pushed
the
push-yooqylxlsuxz
branch
from
bb838e7 to
0e41da5
Compare
emesterhazy
force-pushed
the
push-tltrxnqyokzz
branch
2 times, most recently
from
23ad80c to
f318800
Compare
PhilipMetzger
added a commit
that referenced
this pull request
Apr 19, 2024
Also move some sentences away from "check out" to "create a new revision ...", even if it isn't the phrasing we want. Fixes #3486
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.