"This branch has conflicts that must be resolved" but it's already merged

Question

I merged a PR with the GitHub web interface, which resolved in a successful merge commit.

Afterwards, GitHub is complaining This branch has conflicts that must be resolved. Does anybody know why or how to get the status merged?

Solution

You'll need to update your branch with new commits from master, resolve those conflicts and push the updated/resolved branch to GitHub.

git checkout master
git pull
git checkout <branch>
git merge master
[ ... resolve any conflicts ... ]
git add [files that were conflicted]
git commit
git push

Comments

[Dan]

Thank you for your help. Which brach do I have to check out the after master, @Smbat Pogosyan ?

[Smbat Poghosyan]

To branch which you want to merge with master, I think.

[Dan]

I don't know why, but after merging master into RP-branch and merging RP again into master it worked. Now I merged the RP two times but at least Github isn't nagging anymore.