関連ワード:  git merge using command line    git merge from command line    git merge using theirs command line    git merge request from command line    git merge pr from command line    git merge with squash command line    git merge branch from command line    git merge conflicts from command line    git merge command line example    git merge command line commit message