関連ワード:  git merge or pull    git merge or pull request    git merge or git pull origin    git merge pull request command line    git merge pull request locally    git merge pull request into local branch    git merge pull request to another branch    git merge pull push    git merge pull rebase    git merge pull changes from another branch