関連ワード:  git merge keep current changes    git merge keep all current changes  
結果 : git merge keep current changes