Ensure that all unmerged files are merged when conflict checking (#20528)#20536

6543 merged 2 commits intogo-gitea:release/v1.17go-gitea/gitea:release/v1.17from

6543-forks:backport-205286543-forks/gitea:backport-20528Copy head branch name to clipboard