I'd be unstoppable if I finally stop postponing learning how to git stash, lmao.

Mika

I'd be unstoppable if I finally stop postponing learning how to git stash, lmao. What I've been doing for years instead :

mv <some-pending-file> ..
git restore .
git pull
mv ../<some-pending-file> .

Mika

ok I just watched a quick tutorial on stashing, and it does make me feel silly doing what I've been doing considering how simple it seems to 'stash' xD

Null

@irfan git worktree is another unappreciated command in this space. It recreates your repo on a branch at a different directory. So if I want to keep my changes and still checkout main, I can do

mkdir -p ../main
git worktree add ../main main
cd ../main

and essentially have both branches checked out at once.

Wandering Adventure Party

I'd be unstoppable if I finally stop postponing learning how to git stash, lmao.