Skip to content
loading...

re: A Fool-Proof Way to Keep Your Fork Caught Up in Git VIEW POST

FULL DISCUSSION
 

If I have local changes, I prefer to stash, change the tracking branch, pull, change the tracking branch back, re-apply stash, deal with any conflicts, push!!! It makes me feel comfy for some reason! I am scared of rebase.

 

I used to be scared of rebase, but I got used to it and now it's one of my favorite git commands. It can be scary though.

code of conduct - report abuse