PR can't be merged after manual conflict resolution

[JetpackDuba]

• Gitea version (or commit ref): Commit: e6da2cf
• Git version: 2.7.4
• Operating system: Linux Mint 18
• Database (use [x]):
  • PostgreSQL
  • MySQL
  • SQLite

Description

If I do a PR with conflicts, gitea says that I have to merge branch manually ( This pull request can't be merged automatically because there are conflicts. ). I've done it but the message does not disappear. I closed the PR, then reopened it and now if I go to the merge request I get the following message everytime:

The conflict checking is still in progress, please refresh page in few moments.

Steps to reproduce

• Create new PR with a conflict between the 2 branches
• Merge manually the branch fixing the conflicts
• Close the PR
• Reopen it

[Bwko]

I'm able to semi reproduce this bug. My Gitea keeps nagging about:

This pull request can't be merged automatically because there are conflicts.

I'll look into this.

[JetpackDuba]

If you don't close it, you'll get this message. If you close it and then reopen it, The conflict checking is still in progress, please refresh page in few moments. will appear

[Bwko]

I've opened & closed the PR multiple times:

Was you PR relatively large?

[lunny]

I can't reproduce it. Any more clues?

[strk]

Check the logs, I bet you got a panic in a goroutine (saw that happening) so some parts of the code are just waiting for something that will never happen (hearing back from the goroutine). It would help if panic messages were included in the logs but they only go to either stdout or stderr (I'm not sure which one).

So my suggestion is:

• restart Gitea (or Gogs) redirecting stdout and stderr somewhere
• check all logs if it still happens

[strk]

See #210 for the missing stderr/stdout redirection

[JetpackDuba]

I've tried it again in a windows pc and I get the same behavior as @Bwko

This pull request can't be merged automatically because there are conflicts.

I'm testing this with small PR

[Bwko]

So the behavior is the same on Linux (I'm on Linux) & Windows.
At least we need to show a message that this PR has been merged.

[JetpackDuba]

@strk I'm getting an error when restarting Gitea in my Linux Mint:

Entrada desconocida (Spanish) -> Unknown input

gogs.log.zip

I can share with you my Database and repos (They are just test repos) if it's necessary to debug it

[Bwko]

If you could share your repo it would help us a lot. Googling the git apply error points me to a whitespace error. Are there any whitespace 'like' characters in your reppo/PR?

[JetpackDuba]

@Bwko oke! Tonight I will attach my repo, I'm not at home atm