Replies: 1 comment 5 replies
-
I'd probably consider the same two options.
What do you mean? If I wanted to get rid of the merge in this situation, I'd first get rid of all of its children. The |
Beta Was this translation helpful? Give feedback.
5 replies
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
-
I'm working on a couple of changes that are being pushed to github. One of these tests fixes a problem with my test framework, and I need this change to be able to work on the other changes. But, to github, I want them to remain independent.
What I'm doing now is that I basically work, until I think I'm ready to test. Then I do the following:
jj new @ test-fix cargo test ... jj abandon @
This seems to work, as long as I'm careful.
I've also tried just making new work on top of the merge, and then rebasing the work "around" the merge back to the main tree. But, I found it harder to get rid of the merge then.
Any suggestions on how to do this better?
Beta Was this translation helpful? Give feedback.
All reactions