title: Git: How to keep local feature branch updated with changes made in dev?
body: <p>I've been following this guide for working with distributed git projects: <a href="http://nvie.com/posts/a-successful-git-branching-model/" rel="noreferrer">http://nvie.com/posts/a-successful-git-branching-model/</a>. 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 <code>dev</code>. Is this possible? I was researching this and found I would probably need to use <code>rebase</code>. But there were so many options I didn't know exactly which one I needed to use. How would I do this?</p>