Git commands to pull remote and merge with current branch

gistfile1.sh

# save current changes (if any) to stash
git stash save

# pull remote changes to local
git pull origin

# apply stash and try auto merge
git stash pop
# OR
git stash apply

# if there are conflicts, use mergetool
git mergetool

#then choose 'meld' (install meld before hand)