▲ 33 ▼ What version control software do you use? (lemmy.dbzer0.com) submitted 1 year ago by orize@lemmy.dbzer0.com to c/godot@programming.dev 29 comments fedilink hide all child comments
[–] un_ax@lemmy.sdf.org 6 points 1 year ago* (1 child) I've been trying out Jujutsu recently. It's compatible with git repos. The workflow takes a little while to get used to but can be nicer to work with. permalink fedilink source hideshow 2 child comments replies: [–] tatterdemalion@programming.dev 3 points 1 year ago (1 child) 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. permalink fedilink source parent hideshow 2 child comments replies: [–] StrikeForceZero@programming.dev 1 point 1 year ago (1 child) 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? permalink fedilink source parent hideshow 2 child comments replies: [–] tatterdemalion@programming.dev 1 point 1 year ago I probably can't give a good technical comparison of the power of git reflog vs jj op log, but I find jj op log much easier to use. permalink fedilink source parent
[–] tatterdemalion@programming.dev 3 points 1 year ago (1 child) 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. permalink fedilink source parent hideshow 2 child comments replies: [–] StrikeForceZero@programming.dev 1 point 1 year ago (1 child) 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? permalink fedilink source parent hideshow 2 child comments replies: [–] tatterdemalion@programming.dev 1 point 1 year ago I probably can't give a good technical comparison of the power of git reflog vs jj op log, but I find jj op log much easier to use. permalink fedilink source parent
[–] StrikeForceZero@programming.dev 1 point 1 year ago (1 child) 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? permalink fedilink source parent hideshow 2 child comments replies: [–] tatterdemalion@programming.dev 1 point 1 year ago I probably can't give a good technical comparison of the power of git reflog vs jj op log, but I find jj op log much easier to use. permalink fedilink source parent
[–] tatterdemalion@programming.dev 1 point 1 year ago I probably can't give a good technical comparison of the power of git reflog vs jj op log, but I find jj op log much easier to use. permalink fedilink source parent