git - How do you merge and close a pull request that has a conflict? -

say merge in 1 pull request, makes 1 out of date , unable merged in.

i following:

$ git remote add <username> <url> $ git fetch <username> $ git co -b <pull-request-branch> <username>/<pull-request-branch> $ git rebase master 

make appropriate changes

$ git add . $ git rebase --continue $ git checkout master $ git merge <pull-request-branch> $ git push origin master 

but not automatically close pull request.

is there way directly fetch pull request itself, merge in, , push master automatically close pull request?

as documented, pr closed when merged master branch.

except here, changed pr branch, rebasing on top of master.
not role. contributor submitting pr supposed (rebasing on top of upstream/master, upstream being remote referring original repo)

you should merge pr branch, , merge should fast-forward one.

is there way directly fetch pull request itself, merge in, , push master?

that started do:

git remote add <username> <url> git fetch <username> 

then:

git checkout master git merge <username>/<pull-request-branch> git push