関連ワード:  git pull divergent branches merge    git pull reconcile divergent branches    git pull divergent branches  
結果 : git pull divergent branches merge