git fetch
ex) Your branch is behind ‘origin/master’ by 1 commit, and can be fast-forwarded
git pull [원격명] [브랜치명]
conflict