Update git local branch with latest upstream OpenStack changes

asked 2015-02-27 23:20:10 -0500

Sarbajit gravatar image

I have followed the "How to contribute" guide of OpenStack and created a local bugfix branch (sarbac-bugfix) and submitted some changes. Review is complete and code is merged.

Now I want to reuse the same branch for my next bugfix work. So, the local branch needs to be updated to latest upstream changes. What is the OpenStack recommended way?

Or I must create a new local branch after updating my master (local) branch, like I did for the sarbac-bugfix branch (below)?

git remote update
git checkout master
git pull --ff-only origin master
git checkout -b TOPIC-BRANCH
edit retag flag offensive close merge delete