Comment on Google Launches Project IDX, A web-based IDE
knoland@kbin.social 1 year agobut don’t want to commit early so you can pull down the changes to your laptop.
Someone needs to tell this man about rebasing.
Comment on Google Launches Project IDX, A web-based IDE
knoland@kbin.social 1 year agobut don’t want to commit early so you can pull down the changes to your laptop.
Someone needs to tell this man about rebasing.
Spectacle8011@lemmy.comfysnug.space 1 year ago
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.
MantisWaffle@lemmy.world 1 year ago
If only there was some syncing thing that would let you move arbitrary files between devices.
github.com/syncthing
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:
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.
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.