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.
We're a place where coders share, stay up-to-date and grow their careers.
We strive for transparency and don't collect excess data.