関連ワード:  git pull origin master divergent branches    git pull origin master need to specify how to reconcile divergent branches    git pull divergent branches    git pull reconcile divergent branches  
結果 : git pull origin master divergent branches