3 ms·
Just my feedback - I've personally found jj more complex for simple projects. Like if you have a non-collaborative repo where you push to main most of the time
by zZorgz 1y ago
Just my feedback - I've personally found jj more complex for simple projects. Like if you have a non-collaborative repo where you push to main most of the time after making a series of commits, in jj you have to keep updating a bookmark before pushing it and there's no one command to do both.
If you have another machine on main without any outstanding changes and you want to pull the latest changes that is probably also two steps (git fetch + new?)
That said, I've been liking jj quite a bit for more mature / collaborative projects. It has been a learning experience. (don't enjoy updating bookmarks for PR branches though; jj encourages rewriting history which is not my favorite choice for code review branches; I often work in repos that squash-on-merge).
- steveklabnik 1y agoYeah, in that case you may want to configure bookmarks to auto update for sure :)
- zZorgz 1y agoIs there a way to do that today? For updating bookmarks I've found like half a dozen variants of `tug` alias the community has come to using which is just a slight improvement (bit daunting to newcomer to pick 'best' one and not fan setting up aliases on all my working devices). It would be nice if jj was better than git for the fundamental workflows like this out of the box overall.
- steveklabnik 1y agoYes, it's called "experimental-advance-branches" (because it landed before the branch -> bookmark rename). Here's an example of setting it: https://github.com/jj-vcs/jj/blob/c70f9b5b3fff08a86fb11afc576c55f16f216a3b/cli/tests/sample-configs/valid/experimental-advance-branches.toml#L2-L4 https://github.com/jj-vcs/jj/blob/c70f9b5b3fff08a86fb11afc57...