I came into coding from the traditional research world (environmental science). I started building models in R and Python, and later moved into scientific computing using Python and now dabbling wi...
From the Bob's local feature branch, he can accomplish all this with just:
git pull --rebase origin feature
I use pull --rebase all the time when I don't want a merge commit every time I pull down from the public branch. Simply replays my local commits on top of the remote head.
From the Bob's local
featurebranch, he can accomplish all this with just:git pull --rebase origin featureI use
pull --rebaseall the time when I don't want a merge commit every time I pull down from the public branch. Simply replays my local commits on top of the remote head.Yeah I was going to mention this in the fetch flow.
It actually makes collaborating with rebase completely acceptable as long as you never merge which I think may work at times too.