@jnunemaker trying it now. I would much prefer `jj` integration, but I can work with Git. Under #jjvcs, I frequently rewrite commits, and now I feel limited. I also forgot much of my #Git experience because before jj, I was using #sapling. I think I haven't used git in day-to-day since 2-3 years ago!
Anyway, submitted a couple of feedback items to the Conductor team. We'll see how it evolves. I too am finding #conductor productive at the moment.
@steveklabnik.com yes, I experienced this as well. Not as many commits beyond the conflict, but I find conflict resolution in #jjvcs to be superior to #sapling.
On the other hand, I much prefer Sapling's GitHub integration than jj's. Sapling maintains the PR title and description from the first commit's message when `sl push`, and I really liked that.
#Gitbutler now has it's own review system (compatible with GH PRs) from the creator of GH PRs.
https://blog.gitbutler.com/gitbutlers-new-patch-based-code-review/
So yet another external review system showing how broken #githubs PR system really is.
We now have #ReviewStack (does anyone actually use this), Graphite, and GitButler in the Github compatible alternate review system along with the client side systems (#jj, #ghstacks, #sapling, et al)
However I think GitButler totally misses the mark and continues the the sins of PRs into thinking that you need to groups PRs together into a logic unit.
Phabricator and Gerrit have both supported stacking diffs and the power of stacking was that a change could be related to a feature (i.e building up to implementing it) or just dependent on other features in the stack.
Forcing that a "branch" is has to be a single feature and your commits are reviewable but you still can't stack branches is STILL a hurdle to productivity which is the entire point.
Also no command line for gitbutler makes it my least favorite by far.
Everyone excited with #jujutsu. But I do think #sapling has a lot of polish. A fork of #mercurial, with lots of usability thoughts. 😎 And fully #git compatible as well.
Of course, if you want the real MVP, mercurial is still around. All with the design of using a #DVCS that makes sense. 😁
I seem to have found my footing with #Jujutsu, a new frontend for #Git.
The most important change is that my working copy is *committed in the current change* as soon as I run any Jujutsu command.
This means I can't have a file that's lying around while I move commit to commit. I have to split that file into its own commit, and make that commit an ancestor to any place that needs the file. It's an adjustment, sure.
I am also a user of #Sapling. I enjoy Sapling direct GitHub integration.
💚🌿Man I Love (and will miss so much) Fauna🌿💚
#FineFaunart #ceresfauna #hololive #hololiveen #sapling #vtuber #art #digitalart #fanart #keebart
François 🇨🇦
Daniel
Jacket
Åsa Magnusson
Johanna Forster
Brandon Bennett
Alejandro Baez
Kiba ( = ⩊ = )