[git] fatal: Need to specify how to reconcile divergent branches.

 

git pull 했을 때 아래 오류가 발생

$ git pull
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: your next pull:
hint:
hint:   git config pull.rebase false  # merge
hint:   git config pull.rebase true   # rebase
hint:   git config pull.ff only       # fast-forward only
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.
fatal: Need to specify how to reconcile divergent branches.

 

아래 3가지 방법 중 하나로 pull 한다

git pull --no-rebase ##
git pull --rebase
git pull --ff-only

 

https://stackoverflow.com/questions/62653114/how-can-i-deal-with-this-git-warning-pulling-without-specifying-how-to-reconci

How can I deal with this Git warning? "Pulling without specifying how to reconcile divergent branches is discouraged"