Replying to Avatar Daniel Wigton

Alright #nostr what is your solution to coding on multiple devices? Ubuntu desktop and laptop in my case.

Things I do already.

ssh + gnu/screen + vim: the main drawback is that while I love vim, plugins are fragile and are hard to configure for LLM auto complete.

Keep pushing changes to my git server on a branch: this leads to a bunch of nonsensical commits when I am partway through a change.

Ssh within vs code: it is just unpleasant.

#asknostr
Avatar
jb55 1y ago

I have wireguard setup between my machines, when I want to make my laptop changes available on my desktop at home:

git push desktop HEAD:laptop

When doing early dev with lots of nonsensical changes, i just amend into a WIP commit:

$ git add -u

$ git commit —amend

$ git push desktop HEAD:wip-laptop

Reply to this note

Please Login to reply.

Discussion

Avatar
Daniel Wigton 1y ago

Yeah I need to go deeper with git. My usage is very basic. I never revise anything.

Avatar
Râu Cao ⚡ 1y ago

`git rebase -i` is your friend. Check it out! (No pun intended.)

Also, if you push a generic WIP commit, like Will suggested, you can just `git reset` to the commit before that on your other machine and proceed to commit different pieces of it after.

Avatar
Râu Cao ⚡ 1y ago

Bonus tip: you can `git push -f` to a remote as much as you want, but just don't do it on branches of e.g. a pull request that others may have checked out already. And you can't really lose anything, if it was on your machine before, `git reflog` is your friend for that case.