4 ms·

I like where your head's at and added a little something to help me here at work: void:~% git config alias.funky ! git up && git submodule update And

by smazga 10y ago

I like where your head's at and added a little something to help me here at work: void:~% git config alias.funky ! git up && git submodule update And speaking of lesser known commands, I've been using 'git worktree' recently at work and I'm a big fan. Admittedly, it's probably mostly unknown because it's a new feature. It's a little rough around the edges, but it has made things like customer support context switching much easier since I can leave my current development tree alone and just create a new worktree for the current escalation.

spinningarrow 10y ago
Could you share your workflow with worktree a little? What kind of development do you do and where does it fit in with your workflow? I tried using it in a JS project for those times when I'm in the middle of work but someone asks "hey is master working fine on your system?" - eventually though, having to install all the node and bower modules and rebuild everything on the worktree didn't seem much smoother than just stashing my local changes.
- smazga 10y ago
  Well, admittedly my current situation lends itself well to 'worktree' where normally a stash is probably just fine. At the moment I'm doing a big rework (porting our software from a 10 year-old OS to CentOS 7), so I have many, many modified files (all tiny mods to fix new compiler warnings from new toolchains) and untracked and obsoleted files. Basically, it's too much for me to keep track of if I change anything, so it's a case of "whatever you do, don't touch" that pushes me toward the worktree solution. I've been pulled in to work on customer escalations on released code (one instance from 2 releases ago), so it's just easier for me to create a whole new worktree. I imagine that once I'm back into a normal dev cycle that I'll be back to stashing.

4 ms·

I like where your head's at and added a little something to help me here at work: void:~% git config alias.funky ! git up && git submodule update And

by smazga 10y ago

spinningarrow 10y ago
Could you share your workflow with worktree a little? What kind of development do you do and where does it fit in with your workflow? I tried using it in a JS project for those times when I'm in the middle of work but someone asks "hey is master working fine on your system?" - eventually though, having to install all the node and bower modules and rebuild everything on the worktree didn't seem much smoother than just stashing my local changes.
- smazga 10y ago
  Well, admittedly my current situation lends itself well to 'worktree' where normally a stash is probably just fine. At the moment I'm doing a big rework (porting our software from a 10 year-old OS to CentOS 7), so I have many, many modified files (all tiny mods to fix new compiler warnings from new toolchains) and untracked and obsoleted files. Basically, it's too much for me to keep track of if I change anything, so it's a case of "whatever you do, don't touch" that pushes me toward the worktree solution. I've been pulled in to work on customer escalations on released code (one instance from 2 releases ago), so it's just easier for me to create a whole new worktree. I imagine that once I'm back into a normal dev cycle that I'll be back to stashing.