PR shows merge-able even though it wasn't

[rakshith-ravi]

• Gitea version (or commit ref): 1.8.0-rc2
• Git version: 2.17.1
• Operating system: Ubuntu 18.04.2
• Database (use [x]):
  • PostgreSQL
  • MySQL
  • MSSQL
  • SQLite
• Can you reproduce the bug at https://try.gitea.io:
  • Yes (provide example URL):
  • No: Tried my best to reproduce it, but couldn't. Really sorry this time.
  • Not relevant
• Log gist:

fatal: could not set 'remote.1555169646517240158.url' to '/home/web/*******/repositories/software-team/**my-repo-name****.git'

2019/04/13 21:04:16 [...routers/repo/pull.go:593 MergePullRequest()] [E] Merge: git merge --no-ff --no-commit [/home/web/*******/data/tmp/local-repo/merge-730015198.git]: exec(660:PullRequest.Merge (git merge --no-ff --no-commit): /home/web/*********/data/tmp/local-repo/merge-730015198.git) failed: exit status 1(<nil>) stdout: Auto-merging CHANGELOG.md
CONFLICT (content): Merge conflict in CHANGELOG.md
Automatic merge failed; fix conflicts and then commit the result.
 stderr:  - 
2019/04/13 21:04:21 [...routers/repo/pull.go:593 MergePullRequest()] [E] Merge: git merge --no-ff --no-commit [/home/web/***************/data/tmp/local-repo/merge-294462215.git]: exec(676:PullRequest.Merge (git merge --no-ff --no-commit): /home/web/*************/data/tmp/local-repo/merge-294462215.git) failed: exit status 1(<nil>) stdout: Auto-merging CHANGELOG.md
CONFLICT (content): Merge conflict in CHANGELOG.md
Automatic merge failed; fix conflicts and then commit the result.
 stderr:  - 

Description

So I got this very weird bug when trying to merge a PR to one of my repos. It showed me that the PR was merge-able and then threw this error when I tried to merge it (and gave me a 500). When I manually synchronised the branch with develop (the one I'm trying to merge it to), it worked well after that. Not sure how this happened.

In case it matters, I got a "merge-able" PR first, then I made a small change to CHANGELOG.md and then it showed this, instead of telling me that it's no longer mergeable.

Screenshots

Irrelevant

[supermar1010]

I have a similiar problem, we have PR which it says is mergable but if you click merge you get a 500.

Link to the PR: https://code.toold.xyz/Hochschule/WebAnClient/pulls/16

I've been able to reproduce the issue on the test instance see the PR here: https://try.gitea.io/supermar10/TestRepo/pulls/1
I can give you Repo access if you need it to test it.

I haven't tried manually merging it yet. I will try and report back to know if it has the same cause

This the log from our instance

2019/04/14 08:15:23 [.../runtime/asm_amd64.s:1333 goexit()] [E] PullRequestList.InvalidateCodeComments: exit status 128 - fatal: no such path assets/css/bulma-accordion.sass in features/adminsBoard

2019/04/14 08:30:26 [...modules/base/tool.go:216 SizedAvatarLink()] [E] LibravatarService.FromEmail(email=): error mail: no address
2019/04/14 08:36:18 [...modules/base/tool.go:216 SizedAvatarLink()] [E] LibravatarService.FromEmail(email=): error mail: no address
2019/04/14 08:41:36 [...s/context/context.go:147 NotFoundOrServerError()] [E] GetRepositoryByOwnerAndName: repository does not exist [id: 0, uid: 0, owner_name: vendor, name: assets]
2019/04/14 09:08:28 [...modules/base/tool.go:216 SizedAvatarLink()] [E] LibravatarService.FromEmail(email=): error mail: no address
2019/04/14 09:18:05 [...routers/repo/http.go:199 HTTP()] [E] invalid credentials
2019/04/14 09:18:05 [...routers/repo/http.go:199 HTTP()] [E] invalid credentials
2019/04/14 09:37:09 [...routers/repo/pull.go:594 MergePullRequest()] [E] Merge: git merge --no-ff --no-commit [/data/gitea/tmp/local-repo/merge-345571155.git]: exec(3823:PullRequest.Merge (git merge --no-ff --no-commit): /data/gitea/tmp/local-repo/merge-345571155.git) failed: exit status 1(<nil>) stdout: Removing assets/images/.gitignore
Auto-merging assets/css/style.css
CONFLICT (content): Merge conflict in assets/css/style.css
Automatic merge failed; fix conflicts and then commit the result.
 stderr:  - 
2019/04/14 09:37:53 [...routers/repo/pull.go:594 MergePullRequest()] [E] Merge: git merge --no-ff --no-commit [/data/gitea/tmp/local-repo/merge-540250032.git]: exec(3839:PullRequest.Merge (git merge --no-ff --no-commit): /data/gitea/tmp/local-repo/merge-540250032.git) failed: exit status 1(<nil>) stdout: Removing assets/images/.gitignore
Auto-merging assets/css/style.css
CONFLICT (content): Merge conflict in assets/css/style.css
Automatic merge failed; fix conflicts and then commit the result.
 stderr:  - 
2019/04/14 09:39:14 [...routers/repo/pull.go:594 MergePullRequest()] [E] Merge: git merge --no-ff --no-commit [/data/gitea/tmp/local-repo/merge-776973627.git]: exec(3855:PullRequest.Merge (git merge --no-ff --no-commit): /data/gitea/tmp/local-repo/merge-776973627.git) failed: exit status 1(<nil>) stdout: Removing assets/images/.gitignore
Auto-merging assets/css/style.css
CONFLICT (content): Merge conflict in assets/css/style.css
Automatic merge failed; fix conflicts and then commit the result.
 stderr:  - 
2019/04/14 09:40:54 [...routers/repo/pull.go:594 MergePullRequest()] [E] Merge: git merge --no-ff --no-commit [/data/gitea/tmp/local-repo/merge-767918628.git]: exec(3871:PullRequest.Merge (git merge --no-ff --no-commit): /data/gitea/tmp/local-repo/merge-767918628.git) failed: exit status 1(<nil>) stdout: Removing assets/images/.gitignore
Auto-merging assets/css/style.css
CONFLICT (content): Merge conflict in assets/css/style.css
Automatic merge failed; fix conflicts and then commit the result.
 stderr:  -

[MarkusAmshove]

Seems to be the opposite, but maybe same cause, as #6417

[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.

[rakshith-ravi]

Well, I personally haven't faced this issue again. I'll be closing this for now. For anyone else who stumbles upon this through google, please open a new issue.