129
you are viewing a single comment's thread
view the rest of the comments
view the rest of the comments
this post was submitted on 12 Aug 2023
129 points (88.6% liked)
Programming
17314 readers
344 users here now
Welcome to the main community in programming.dev! Feel free to post anything relating to programming here!
Cross posting is strongly encouraged in the instance. If you feel your post or another person's post makes sense in another community cross post into it.
Hope you enjoy the instance!
Rules
Rules
- Follow the programming.dev instance rules
- Keep content related to programming in some way
- If you're posting long videos try to add in some form of tldr for those who don't want to watch videos
Wormhole
Follow the wormhole through a path of communities !webdev@programming.dev
founded 1 year ago
MODERATORS
I rebase! I just don't want to push to the main repo, pull it down, rebase and force push to it. Pushing to a disposable branch is an obvious solution I didn't see, haha. I tend to not use branching a lot in my projects...
...I guess I could actually set up my desktop as a remote too, huh.
If only there was some syncing thing that would let you move arbitrary files between devices.
https://github.com/syncthing
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:
Well, conflicting reports really, but it's enough to make me wary. Interestingly, someone recommends the branch solution as an alternative:
Seemed to be working out well for the OP, though.
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.
If you're worried you could just ignore your '.git' folder in syncthing since you're purposefully not committing during this. Then sync through git when you finally commit your changes on a device.
Fair enough, thanks!