Jeff Jeff - 9 days ago 6
Git Question

Git: How to keep local feature branch updated with changes made in dev?

I've been following this guide for working with distributed git projects: http://nvie.com/posts/a-successful-git-branching-model/. It has worked well but now I have run into a snag. I have created a local feature branch. I would like to keep this feature branch up-to-date with the latest changes made in

dev
. Is this possible? I was researching this and found I would probably need to use
rebase
. But there were so many options I didn't know exactly which one I needed to use. How would I do this?

Answer

Periodically:

λ git checkout dev
λ git pull origin dev
λ git checkout myfeaturebranch
λ git merge dev
Comments