`Resolve conflicts` button doesn't go away after resolution

A pull request [1] had three simple conflicts in one file. I resolved them in GitHub text editor, marked as resolved then committed [2]. I see my forked branch [3] is merged with master but pull request still insists on conflicts and doesn’t understand that file is updated now! It still uses previous file which has conflicts.

[1] https://github.com/apache/struts/pull/179

[2] https://github.com/apache/struts/pull/179/commits/dc645bec4d6aa21b88372a06f0eca0c7b7b0d38b

[3] https://github.com/yasserzamani/struts/blob/dc645bec4d6aa21b88372a06f0eca0c7b7b0d38b/core/src/test/java/com/opensymphony/xwork2/DefaultActionInvocationTest.java#L28

Today it gone away itself! I don’t know why? Today we just merged another PR into master!

Hi @yasserzamani I’m glad this ended up being resolved for you!

For future reference, we have some wonderful Help Docs that might help you problem solve a merge conflict like this, if you should run into another in the future.