PR can&#39;t be merged after manual conflict resolution #88

@lunny commented on GitHub (Nov 30, 2016):

I can't reproduce it. Any more clues?

@lunny commented on GitHub (Nov 30, 2016): I can't reproduce it. Any more clues?

GiteaMirror commented

@strk commented on GitHub (Nov 30, 2016):

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 commented on GitHub (Nov 30, 2016): 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

GiteaMirror commented

@strk commented on GitHub (Nov 30, 2016):

See #210 for the missing stderr/stdout redirection

@strk commented on GitHub (Nov 30, 2016): See #210 for the missing stderr/stdout redirection

GiteaMirror commented

@JetpackDuba commented on GitHub (Nov 30, 2016):

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

@JetpackDuba commented on GitHub (Nov 30, 2016): 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

GiteaMirror commented

@Bwko commented on GitHub (Nov 30, 2016):

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.

@Bwko commented on GitHub (Nov 30, 2016): 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.

GiteaMirror commented

@JetpackDuba commented on GitHub (Nov 30, 2016):

@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

@JetpackDuba commented on GitHub (Nov 30, 2016): @strk I'm getting an error when restarting Gitea in my Linux Mint: ![imagen](https://cloud.githubusercontent.com/assets/16917468/20771654/9707f0b8-b74a-11e6-8c77-2eb18be014a6.png) Entrada desconocida (Spanish) -> Unknown input [gogs.log.zip](https://github.com/go-gitea/gitea/files/623017/gogs.log.zip) I can share with you my Database and repos (They are just test repos) if it's necessary to debug it

GiteaMirror commented

@Bwko commented on GitHub (Nov 30, 2016):

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?

@Bwko commented on GitHub (Nov 30, 2016): 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' ](https://en.wikipedia.org/wiki/Whitespace_character)characters in your reppo/PR?

GiteaMirror commented

@JetpackDuba commented on GitHub (Dec 1, 2016):

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

@JetpackDuba commented on GitHub (Dec 1, 2016): @Bwko oke! Tonight I will attach my repo, I'm not at home atm

GiteaMirror commented

@JetpackDuba commented on GitHub (Dec 1, 2016):

DB SQL backup and my repo:
Gitea.zip
User: test@gmail.com
Password: TestTest
If you need something else I'll try to help!

@JetpackDuba commented on GitHub (Dec 1, 2016): DB SQL backup and my repo: [Gitea.zip](https://github.com/go-gitea/gitea/files/625632/Gitea.zip) User: test@gmail.com Password: TestTest If you need something else I'll try to help!

GiteaMirror commented

@Bwko commented on GitHub (Dec 1, 2016):

@aeab13 Thanks for your help 👍
The bug somehow only exists in your repo (on my machine it sometimes shows the same error). But when I switch back to my own installation I'm not able to reproduce this bug.

I think the easiest solution is to prevent the execution of the .testPatch method (which produces the error). I'ts pretty useless to test a patch with 0 commits and 0 files changed.
A better solution would be to automatically mark this PR as merged. And thus avoiding the all the pre merge checks. But I don't know if this solution is possible.

@Bwko commented on GitHub (Dec 1, 2016): @aeab13 Thanks for your help :+1: The bug somehow only exists in your repo (on my machine it sometimes shows the same error). But when I switch back to my own installation I'm not able to reproduce this bug. - I think the easiest solution is to prevent the execution of the .testPatch method (which produces the error). I'ts pretty useless to test a patch with 0 commits and 0 files changed. - A better solution would be to automatically mark this PR as merged. And thus avoiding the all the pre merge checks. But I don't know if this solution is possible.

GiteaMirror commented

@bkcsoft commented on GitHub (Dec 2, 2016):

Title changed to clarity

@bkcsoft commented on GitHub (Dec 2, 2016): Title changed to clarity

GiteaMirror commented

@JetpackDuba commented on GitHub (Dec 6, 2016):

@bkcsoft thanks for changing the title!
@Bwko thanks to you!
I've reinstalled my OS and I'll try again to create a PR with conflicts to try to reproduce it again.

PD: Does this issue still need more feedback? (I'm talking about the label)

@JetpackDuba commented on GitHub (Dec 6, 2016): @bkcsoft thanks for changing the title! @Bwko thanks to you! I've reinstalled my OS and I'll try again to create a PR with conflicts to try to reproduce it again. PD: Does this issue still need more feedback? (I'm talking about the label)

GiteaMirror commented

@Bwko commented on GitHub (Dec 8, 2016):

@aeab13 Could you check if #368 fixes your issue?

@Bwko commented on GitHub (Dec 8, 2016): @aeab13 Could you check if #368 fixes your issue?

GiteaMirror commented

@JetpackDuba commented on GitHub (Dec 9, 2016):

@Bwko I'll test it tonight!

@JetpackDuba commented on GitHub (Dec 9, 2016): @Bwko I'll test it tonight!

GiteaMirror commented

@JetpackDuba commented on GitHub (Dec 9, 2016):

I'm having some problems with mysql in my machine.
I'll test tomorrow the changes :s Sorry!

@JetpackDuba commented on GitHub (Dec 9, 2016): I'm having some problems with mysql in my machine. I'll test tomorrow the changes :s Sorry!

GiteaMirror commented

@JetpackDuba commented on GitHub (Dec 11, 2016):

I've tested changes in #368
The message The conflict checking is still in progress, please refresh page in few moments. has disappeared but I'm still getting This pull request can't be merged automatically because there are conflicts. after manual merge and I can't see commits and changed files. So the problem is still the same with different message :p
EDIT: I can't see commits and changed file in the selected pull request only if I close it and reopen it.

EDIT2: I've checked the PR again and now I can see commit and files changed but still getting the same message

@JetpackDuba commented on GitHub (Dec 11, 2016): I've tested changes in #368 The message `The conflict checking is still in progress, please refresh page in few moments.` has disappeared but I'm still getting `This pull request can't be merged automatically because there are conflicts.` after manual merge and I can't see commits and changed files. So the problem is still the same with different message :p EDIT: I can't see commits and changed file in the selected pull request only if I close it and reopen it. ![spectacle bz3630](https://cloud.githubusercontent.com/assets/16917468/21082953/be9a1b84-bfe6-11e6-9f3c-8420440a5acc.png) EDIT2: I've checked the PR again and now I can see commit and files changed but still getting the same message

GiteaMirror commented

@Bwko commented on GitHub (Dec 13, 2016):

@aeab13 Thanks for testing.
My PR fixed the bug that was causing the The conflict checking is still in progress, please refresh page in few moments. error.

I haven't found a good solution on how to mark the conflicting PR as merged. So for now I don't know how to solve this issue 😟
Maybe someone else has any idea?

@Bwko commented on GitHub (Dec 13, 2016): @aeab13 Thanks for testing. My PR fixed the bug that was causing the `The conflict checking is still in progress, please refresh page in few moments.` error. I haven't found a good solution on how to mark the conflicting PR as merged. So for now I don't know how to solve this issue :worried: Maybe someone else has any idea?

GiteaMirror commented

@JetpackDuba commented on GitHub (Dec 22, 2016):

I would like to try to fix it but I haven't got time to do that right now :s
If it is not fixed in a month or so, I'll try.
Thanks for trying it @Bwko ! :D

@JetpackDuba commented on GitHub (Dec 22, 2016): I would like to try to fix it but I haven't got time to do that right now :s If it is not fixed in a month or so, I'll try. Thanks for trying it @Bwko ! :D

GiteaMirror commented

@lunny commented on GitHub (Dec 22, 2016):

@aeab13, if you have no time, could you give some idea about where the problem is?

@lunny commented on GitHub (Dec 22, 2016): @aeab13, if you have no time, could you give some idea about where the problem is?

GiteaMirror commented

@lunny commented on GitHub (Dec 22, 2016):

move this to 1.1 and feel free to change it back if someone has good idea.

@lunny commented on GitHub (Dec 22, 2016): move this to 1.1 and feel free to change it back if someone has good idea.

GiteaMirror commented

@grissiom commented on GitHub (Jan 9, 2017):

@lunny I think git merge-base --is-ancestor will help you to detect whether a PR has been merged manually or not. I a PR has already been merged, git merge-base --is-ancestor pull/x/head HEAD will return 0. If the PR has not been merged, it will return 1.

@grissiom commented on GitHub (Jan 9, 2017): @lunny I think `git merge-base --is-ancestor` will help you to detect whether a PR has been merged manually or not. I a PR has already been merged, `git merge-base --is-ancestor pull/x/head HEAD` will return 0. If the PR has not been merged, it will return 1.

GiteaMirror commented

@lunny commented on GitHub (Jan 9, 2017):

@Bwko could you try to send another PR followed @grissiom 's advice?

@lunny commented on GitHub (Jan 9, 2017): @Bwko could you try to send another PR followed @grissiom 's advice?

GiteaMirror commented

@Bwko commented on GitHub (Jan 9, 2017):

@lunny & @grissiom I'll take a look at that

@Bwko commented on GitHub (Jan 9, 2017): @lunny & @grissiom I'll take a look at that

GiteaMirror commented

@Bwko commented on GitHub (Jan 20, 2017):

I'm almost done with this 😄
Do we want to automatically set a PR to merged or do we want to show a message that this PR was manually merged?

@Bwko commented on GitHub (Jan 20, 2017): I'm almost done with this :smile: Do we want to automatically set a PR to merged or do we want to show a message that this PR was manually merged?

GiteaMirror commented