3 ms·

There's a common(?) use case for git/jujutsu that I can't find a simple answer to: I clone a repo. I make some changes to my copy. But then I want to keep my c

There's a common(?) use case for git/jujutsu that I can't find a simple answer to: I clone a repo. I make some changes to my copy. But then I want to keep my copy up to date with the original repo by stirring in all the updates that have been made lately to the original repo. Seems like it oughta be simple, but git makes it mysterious. Will jujutsu make this possible using only simple, sensible CLI commands ? And conflicts will be nicely stored away for near-term cleanup ? Inquiring minds want to know.

Zambyte 2y ago
jj fetch # get the most recent changes from the remote jj rebase -b @ -d branch@remote # rebase the branch of the current working commit onto the newly fetched commits. Note that the way to do this with git is almost identical, but maybe not as obvious. In git I think this can be done with a single command though: git pull --rebase. If this is not the state you want your repo to be in and I misunderstood, I'm still pretty confident I could get a repo in the state you want using Jujutsu quite easily :) Edit: though also the git way to do this would kind of force you to deal with cleaning up conflicts immediately, whereas with Jujutsu you can put off conflicts indefinitely.