When conflicts have been previously detected ensure that they can be resolved#19247

6543 merged 4 commits intogo-gitea:maingo-gitea/gitea:mainfrom

zeripath:really-reset-the-conflict-statuszeripath/gitea:really-reset-the-conflict-statusCopy head branch name to clipboard