[GIT] git 에서 pull 받으려 할 때 다음과 같이 error 날 경우

hint: You have divergent branches and need to specify how to reconcile them. 
hint: You can do so by running one of the following commands sometime before

hint: git config pull.rebase false # merge 
hint: git config pull.rebase true # rebase 
hint: hint: You can replace "git config" with "git config --global" to set a default hint: preference for all repositories. You can also pass --rebase, --no-rebase, 
hint: or --ff-only on the command line to override the configured default per hint: invocation. Need to specify how to reconcile divergent branches.

 

위와 같은 에러가 날 경우

1. git pull --ff-only

2. git config --global pull.ff only

위의 두 명령어 실행하면 해결 된다.