How to "pull" from a local branch into another one?
What you are looking for is merging.
git merge master
With pull
you fetch changes from a remote repository and merge them into the current branch.
You have to tell Git from where to pull, in this case from the current directory/repository (.
):
git pull . master
But when working locally, you can simply use merge (pull internally calls merge):
git merge master
Quite old post, but it might help somebody new into git.
I will go with
git rebase master
- much cleaner log history and no merge commits (if done properly)
- need to deal with conflicts, but it's not that difficult.