• uEnglish
    0•1 month ago

    I use git even though I only know how to commit and push

  • @[email protected]
    4•2 months ago

    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.

    • @[email protected]
      2•2 months ago

      can be nicer

      Understatement. It solves almost every problem I’ve ever had with git.

      1. No more destructive commands. jj undo or jj op restore can always put you back into a good state.
      2. Merge conflicts can be ignored until you want to resolve them.
      3. No “unstaged files” to deal with. Just keep your .gitignores up to date and jj automatically tracks new files.
      4. Rebasing and patch management is just incredibly simple.
      5. 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.

      • @[email protected]
        0•2 months ago

        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?

        • @[email protected]
          1•2 months 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.

  • OnionononEnglish
    1•2 months ago

    Perforce when I was doing it professionally but now for hobby just github desktop.

  • @[email protected]
    3•2 months ago

    Git here. Subversion for a while before that. And source safe, or as I like to say source “safe”, before that.

    But maybe a better question would be, what source control hosting site (if any) do you use? And do any of them not forcibly use your code to train their AI?

  • @[email protected]English
    1•2 months ago

    I mostly use git and I’ve recently been exploring anchorpoint as a way to bridge the gap between me and the less technical friends. It’s does the job reallt well and I’ve been happy with it so far. It being a wrapper around a git repo is a very convenient compromise - I get to pick my hosting, use CLI, while other members of the team can use a more robust visual program.

  • Nafeon (Lemmy, don't "@" this
    1•2 months ago

    We use perforce at work (I use git with smartgit and TortoiseGit UI, whatever I feel like) on unity I use a package called wise for unity, which is really cool and I wish would exist in Godot.

    We use perforce because we have a lot of unreal and unity and admittedly git is really bad with big binaries. It was never designed for that and git lfs ist basically just a bandaid.

    In general for gamedev you’ll run into a problem that a scene will be modified by 2 people. For that it is good to have perforce, as it locks a file and will tell you, that someone is working on it. Git lfs has something similar, but the again. This file locking is not yet supported by Godot.

    But yes for unity and unreal at work… Even if perforce is expensive and not open source and I miss git-branches, it is an important tool and was worth the money for a company.

    For your own small projects I recommend git with git-lfs

  • @[email protected]
    1•2 months ago

    I used to use the OpenVMS file system for informal version control, while I was developing something and before it was ready to be committed to the repository.