Re:Jujutsu VCS Introduction and Patterns
by ashenke on Tuesday February 04, 2025 @08:11PM
(#42942026)
For every feature we usually have two developers working on it, one frontend and one backend, working on the same feature branch.
Would Jujitsu cause a problem in this context?
[ Parent
| on HN ]
Re:Jujutsu VCS Introduction and Patterns
by stouset on Tuesday February 04, 2025 @11:35PM
(#42943850)
I haven't used this workflow personally, but it should be fine.
`jj git push` does an equivalent to `--force-with-lease`, so if there are remote commits that are later than what your current bookmark points to, it won't overwrite them. You can `jj git fetch`, it'll update your bookmark, and you can choose to put your new commits onto the updated sequence of commits wherever they belong.
Re:Jujutsu VCS Introduction and Patterns
by steveklabnik on Wednesday February 05, 2025 @10:27AM
(#42949823)
Just to be clear, as with git, you don’t have to rebase. It’s just that doing so is nicer in jj. But if rewriting commits on a shared branch becomes onerous, don’t do that!