Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Conflict detection broken for PRs that have been updated via merge to resolve conflicts #18130

Closed
CirnoT opened this issue Dec 29, 2021 · 1 comment · Fixed by #18139
Closed

Conflict detection broken for PRs that have been updated via merge to resolve conflicts #18130

CirnoT opened this issue Dec 29, 2021 · 1 comment · Fixed by #18139
Labels
type/bug

Comments

@CirnoT
Copy link
Contributor

CirnoT commented Dec 29, 2021

Gitea Version

1.16.0+dev-759-g8ce1b539b

Git Version

No response

Operating System

No response

How are you running Gitea?

Docker (:dev-rootless) or https://try.gitea.io

Database

No response

Can you reproduce the bug on the Gitea demo site?

Yes

Log Gist

No response

Description

Exists since #18004 was merged (so since f1e8562; last working is 9296baf).

Simplest example can be seen on https://try.gitea.io/Yumaa/kanna/pulls/1

Screenshots

No response
@lunny lunny added the type/bug label Dec 31, 2021
@lunny
Copy link
Member

lunny commented Dec 31, 2021

Maybe @zeripath can help.

@zeripath zeripath mentioned this issue Dec 31, 2021
Merged
@go-gitea go-gitea locked and limited conversation to collaborators Apr 28, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Assignees
No one assigned
Labels
type/bug
Projects
None yet
Milestone
No milestone
Development

Successfully merging a pull request may close this issue.

Reset the conflicted files list in testpatch zeripath/gitea
2 participants
@lunny @CirnoT