| 1 Aug 2025 |
raitobezarius | Maybe I should forcibly switch myself to Jujutsu to understand what can be achieved | 16:33:15 |
Qyriad | we are likely doing that soon | 16:33:30 |
raitobezarius | But really, this is the best I can offer at this point in time | 16:33:28 |
Charles | do iiiiiiit | 16:33:31 |
Qyriad | puck uses Jujutsu iwrc | 16:33:41 |
Qyriad | idk what she does with Lix with it | 16:33:47 |
emily | I have seen jade_ active in Jujutsu spaces too at least | 16:33:55 |
helle (just a stray cat girl) | yes, she has been trying to convince me to use it as well | 16:35:08 |
emily | as long as you have a formatting tool that can work in-memory on entire files (treefmt with the right configuration achieves this, clang-format can do it, nixfmt can do it, etc.) you can jj fix -s X on any X that has formatting-related conflicts (e.g., from a rebase or merge or revert) and the remaining conflicts in X and its children will be exactly the non-formatting ones. (jj fix -s X is also the tool that fixes formatting in X and its children in the absence of any conflicts)
I wouldn't call this a Jujutsu perk though because as I said the exact same results can be achieved with Git and insofar as it is more awkward to do so it is only the usual Jujutsu–Git delta of awkwardness
| 16:36:02 |
Charles | jj is great. i was hesitant to try it because i felt pretty comfortable with git despite its terrible ux but i regret not trying jj sooner because it's genuinely a huge improvement | 16:36:08 |
raitobezarius | In reply to @emilazy:matrix.org
as long as you have a formatting tool that can work in-memory on entire files (treefmt with the right configuration achieves this, clang-format can do it, nixfmt can do it, etc.) you can jj fix -s X on any X that has formatting-related conflicts (e.g., from a rebase or merge or revert) and the remaining conflicts in X and its children will be exactly the non-formatting ones. (jj fix -s X is also the tool that fixes formatting in X and its children in the absence of any conflicts)
I wouldn't call this a Jujutsu perk though because as I said the exact same results can be achieved with Git and insofar as it is more awkward to do so it is only the usual Jujutsu–Git delta of awkwardness
yes but let's be clear again | 16:36:35 |
raitobezarius | i don't want to make Lix a project that is jj-only | 16:36:43 |
raitobezarius | or usable very much only if you use jj | 16:36:49 |
emily | see my second paragraph :( | 16:36:54 |
raitobezarius | ok sorry :( | 16:37:01 |