merge branch that was created from old commit to master

Question

I created a new branch from old master-commit. When trying to merge it with master using

git checkout master
git merge newbranch

I am getting

Answer 1

You need to go back to the master branch (git checkout master) and then merge in your new branch (git merge ). That will pull over the changes from that branch into your master branch.

Read more here: http://git-scm.com/book/en/Git-Branching-Basic-Branching-and-Merging