Skip to content

PRs stuck on "Merge conflict checking is in progress. Try again in few moments." #17204

Closed
@abentpole

Description

@abentpole

Gitea Version

1.15.3

Git Version

2.17.1

Operating System

Ubuntu Server

How are you running Gitea?

I'm running Gitea on Docker, with image: gitea/gitea:latest

Database

SQLite

Can you reproduce the bug on the Gitea demo site?

No

Log Gist

No response

Description

I'm not sure if it correlates with a recent update of Gitea, but all open PRs for a project are listed as "Merge conflict checking is in progress. Try again in few moments." I'm also running Drone CI checks, but these are running and completing as expected.

I was reviewing, updating and merging PRs leading up to this occurring.

Creating a new PR seems to work fine -- Drone runs its check just fine and the "This pull request can be merged automatically" appears. I've tried closing and opening one of the PRs with no change, I've also tried checking out the branch, manually merging master into it and pushing (updating the PR) -- Drone runs, finishes and I'm left with the PR in "Merge conflict checking is in progress".

I'm not seeing any lingering processes in the "Monitoring" section of Site Administration. What would the best kind of log configuration to help me drill down to a cause here, and is there a way to forcibly kick off the "merge conflict checking" process again for a PR?

I have also updated + restarted Gitea to see if that'd help, to no avail.

Any assistance would be appreciated!

Cheers.

Screenshots

No response

Metadata

Metadata

Assignees

No one assigned

    Labels

    issue/needs-feedbackFor bugs, we need more details. For features, the feature must be described in more detailtype/bug

    Type

    No type

    Projects

    No projects

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions