Making local copy of git branch current

Question

I'm using new git tools (BitBucket, SourceTree) and only lightly familiar with git.

When I am at BitBucket (in the browser), there are two branches, master and 2.0.

I cloned the 2.0 branch locally and then I made rogersbranch off of that, where all of my changes have been made.

I didn't do whatever needs to be done to add rogersbranch to what BitBucket has.

Subsequently, someone else has made changes to the 2.0 branch.

What do I do to make my local copy current with what BitBucket has and merge the 2.0 commits into rogersbranch?

Thanks,

Roger

Answer 1

Just do:

git fetch
git checkout rogersbranch
git merge 2.0BranchName