체인의정석

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 ca..