Comment on Google Launches Project IDX, A web-based IDE

• Spectacle8011@lemmy.comfysnug.space ⁨1⁩ ⁨year⁩ ago

  Thanks for the suggestion! If you can believe it, I already have Syncthing installed but haven’t used it in ages. I didn’t even think of using this for keeping git repositories in sync! I did find these forum posts that seem to recommend against using Syncthing for git repositories, though they’re 6-7 years old:

  • forum.syncthing.net/t/…/8404
  • forum.syncthing.net/t/…/1774

  Well, conflicting reports really, but it’s enough to make me wary. Interestingly, someone recommends the branch solution as an alternative:

  One of the objectives of git is to be decentralized. Just make a branch called uncompilable_mess and then clone the repo on your laptop.

  Seemed to be working out well for the OP, though.

  source

  • MantisWaffle@lemmy.world ⁨1⁩ ⁨year⁩ ago

    I’ve had no problem for years.

    Biggest issue I’ve had was forgetting I committed something on one device before committing on another. Then I had two branches where one had " conflict" in the name. I just deleted all conflict files and everything continued as normal. If your repo is never corrupted before syncing worst case you should be able to find and delete all conflict files.

    Syncthing conflicts include the source of the conflict so you could just choose to delete all files whose conflict is from one device and leave everything from the other.

    source

    • Spectacle8011@lemmy.comfysnug.space ⁨1⁩ ⁨year⁩ ago

      Fair enough, thanks!

      source