DEV Community

Discussion on: A Fool-Proof Way to Keep Your Fork Caught Up in Git

glsolaria profile image
G.L Solaria • Edited on

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.

jacobherrington profile image
Jacob Herrington (he/him) Author

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.