git config pull merge code example

Example 1: 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 2: git pull

git checkout new_feature
git pull <remote repo>