orize@lemmy.dbzer0.com to Godot@programming.dev · 3 days agoWhat version control software do you use?message-squaremessage-square29linkfedilinkarrow-up131arrow-down12
arrow-up129arrow-down1message-squareWhat version control software do you use?orize@lemmy.dbzer0.com to Godot@programming.dev · 3 days agomessage-square29linkfedilink
minus-squaretatterdemalion@programming.devlinkfedilinkarrow-up2·17 hours ago can be nicer Understatement. It solves almost every problem I’ve ever had with git. No more destructive commands. jj undo or jj op restore can always put you back into a good state. Merge conflicts can be ignored until you want to resolve them. No “unstaged files” to deal with. Just keep your .gitignores up to date and jj automatically tracks new files. Rebasing and patch management is just incredibly simple. It actually has a nice default view of the commit graph. I used to use StackedGit for a while before switching to Jujutusu. While stg is nice, I think jj is a huge improvement.
minus-squareStrikeForceZero@programming.devlinkfedilinkarrow-up1·15 hours agoAside from the obvious cases like pruning or garbage collection that remove orphaned or dangling commits, is there anything else destructive that git reflog can’t help recover from?
Understatement. It solves almost every problem I’ve ever had with git.
jj undo
orjj op restore
can always put you back into a good state..gitignore
s up to date andjj
automatically tracks new files.I used to use StackedGit for a while before switching to Jujutusu. While
stg
is nice, I thinkjj
is a huge improvement.Aside from the obvious cases like pruning or garbage collection that remove orphaned or dangling commits, is there anything else destructive that
git reflog
can’t help recover from?