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