git pull branch to master code example
Example 1: git pull master into branch
git checkout <branch-name> # gets you on <branch-name>
git fetch origin # gets you up to date with origin
git merge origin/master # pull master into <branch-name>
Example 2: pull from dev branch to master
(on branch development)$ git merge master
(resolve any merge conflicts if there are any)
git checkout master
git merge development (there won't be any conflicts now)
Example 3: git pull
#Basic command, get changes of current branch to remote repo
git pull
#When working with others, I usually stash my local changes
#before pulling in order to avoid conflict commits.
git stash
git pull
git stash pop #Reapply my local changes, eventually merge confl
Example 4: git pull
git checkout new_feature
git pull <remote repo>