Git conflicts are no longer painful! 🔥

🌳 **oyui** — A TUI merge editor and staging interface for Git & Jujutsu

💯 Syntax highlighting, command palette, binary support, fully scriptable configuration & more!

🦀 Written in Rust & built with @ratatui_rs

⭐ GitHub: https://github.com/emilien-jegou/oyui

#rustlang #ratatui #tui #git #jj #terminal #vcs

Started messing with #jujutsu #jj. Has some very neat ideas as expected.

Git interop is a little clunky still, though hopefully I just haven't discovered quite the right commands ("new technology, tutorials are outdated the moment they're published" problems…)

Eg, a rapid fire "fuck, why is my CI/CD not workin right" workflow. In Git, having already done a 'checkout mybranch' that morning:

- git commit -m 'lmao'
- git push

In jj, because you're never "on" a branch:

- jj commit -m 'lmao' (or have done a 'describe' earlier, and do a 'new' now)
- jj bookmark advance mybranch --to @-
- jj git push --bookmark mybranch

Over and over! Obviously I could shell alias this, but.

A big thanks to @vanamerongen for telling me about #jj at the right moment. I was just about to spend a lot of hours fixing some nasty #git stuff. Now I have a way to get it done far easier. #Symfony #SymfonyOnline

PS: `jj describe` needs a shorter alias like desc. :)

Dear #git / #jujutsu / #jj / #lazygit #lazyweb (pun not intended?),

I am gently interested in trying out `jj` sometime, but have invested /significant/ muscle memory in the lazygit TUI (which is flippin' awesome). Has anyone made that /specific/ transition successfully?

Eg,
- did you go back to fully shell-driven SCM actions using `jj`? (because jj is just that good?)
- did you switch to a more editor-plugin-focused workflow? (because one was on offer? btw I use vim)
- did you use lazygit+jj clones/etc like lazyjj (https://github.com/Cretezy/lazyjj)? (which looks non-slop but otherwise haven't tried yet)
- mystery fourth option?

#BoostsWelcome

Using #jjvcs on my repo made me realise, that the blocker was not all the bugs, but the fact that rebasing/merging/keeping consistent commits is a massive PITA with git. Call it a skill issue, but I love how every nightmarish operation is solved in 2-3 commands with jj.

#jj #jjvcs #jj_vcs

My favourite new word at work is #prefactor as in, "Hey #claude Please prefactor the ugly code in this business logic feature change PR so that it is easier to read?"

The refactoring lands in a preparatory PR and everyone gets to review a much easier to understand business logic change follow-up PR.

I suspect the flow would get even nicer if I could find time to skill-up with claude on #jj (or possibly even better #SaplingSCM - since reviews are still the biggest bottleneck)

I’ve been using Jujutsu to manage my git repositories for a few weeks now, and I am not looking back. Ever.

When I code, I feel Git always gets in the way, slowing me down, adding such mental burden. JJ can be used alongside any of your git repos, and makes the version control UX a breeze.

#git #vcs #jujutsu #jj

https://moskitohero.com/post/make-your-vcs-fly-with-jujutsu/

ESC-Auftritt sorgt für Kritik: Sam Dylan rechnet mit Vorjahressieger JJ ab

ESC-Auftritt von JJ entfacht hitzige Online-Debatte Der ESC-Sieger von 2025 hat auf die Kritik bislang noch nicht reagiert.…
#Eurovision #ESC #EurovisionSongContest2026 #JJ #SamDylan
https://www.europesays.com/europa/34274/