How to "pull" from a local branch into another one?
Solution 1:
you have to tell git where to pull from, in this case from the current directory/repository:
git pull . master
but when working locally, you usually just call merge (pull internally calls merge):
git merge master
Solution 2:
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.
Solution 3:
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.