Unable to resolve pull request, when a file with a conflict is modified later to the same content as on the destination

[bluecatchbird]

• Gitea version (or commit ref): 1.9.4
• Can you reproduce the bug at https://try.gitea.io:
  • Yes: https://try.gitea.io/blubb1/blubb/pulls/1
  • No
  • Not relevant

Description

Its not possible to resolve a pull request, when a file with a conflict is modified later to the same content as on the destination branch.

Screenshots

[guillep2k]

Resolving conflicts through the web interface is not currently supported. Conflicts should be resolved in a local copy and pushed back to your PR.

If this is a feature request, it would be cool to have this, of course! But this would be a duplicate of #5158

[zeripath]

I think this is describing a situation whereby there is actually no conflict but Gitea incorrectly thinks there is.

[bluecatchbird]

@zeripath you are right! there is no conflict, but gitea shows one.

[stale]

This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs during the next 2 weeks. Thank you for your contributions.

[zeripath]

Heya could you test again on master I think we may have inadvertently resolved this.

[stale]

This issue has been automatically marked as stale because it has not had recent activity. I am here to help clear issues left open even if solved or waiting for more insight. This issue will be closed if no further activity occurs during the next 2 weeks. If the issue is still valid just add a comment to keep it alive. Thank you for your contributions.

[stale]

This issue has been automatically closed because of inactivity. You can re-open it if needed.