How to pull local master into local branch
merge changes from local_branch TO master
git checkout master
git merge local_branch
merge changes from master TO local_branch
git checkout local_branch
git merge master
Pull is when you have an 'origin' repo :)
git pull
is an alias for git fetch && git merge
you cannot fetch from local branches (only from remotes) - actually you don't need to, if your intention is to merge master
into local_branch
, just use git merge master
when you are on local_branch
.