cd ~/repos/work-project27
git checkout dev
git branch new_feature
### code for a few hours, close laptop, go to sleep, next morning
git checkout dev
### code for a few more hours, close laptop go to sleep, next morning## "oh fuck, I already implemented this in new_feature but differently"
git checkout dev
git diff new_feature
## "oh no. oh no no no. oh fuck. I can't merge any of this upstream and my history is borked."
git clone git@workhub:work/work-project work-project28
cd ~/repos/work-project28
cd ~/repos/work-project27 git checkout dev git branch new_feature ### code for a few hours, close laptop, go to sleep, next morning git checkout dev ### code for a few more hours, close laptop go to sleep, next morning ## "oh fuck, I already implemented this in new_feature but differently" git checkout dev git diff new_feature ## "oh no. oh no no no. oh fuck. I can't merge any of this upstream and my history is borked." git clone git@workhub:work/work-project work-project28 cd ~/repos/work-project28
Truly a Sisyphus tale