github-starred/gitea
2
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2026-03-12 02:24:21 -05:00
Code Issues 2.6k Packages Projects Releases 100 Wiki Activity

Merged pull not marked as merged when conflict checking still in progress #8804

New Issue
Closed
opened 2025-11-02 08:19:09 -06:00 by GiteaMirror · 0 comments
GiteaMirror commented 2025-11-02 08:19:09 -06:00
Owner
Copy Link

Originally created by @fnetX on GitHub (Apr 8, 2022).

Description

Merging a pull request on the web UI doesn't mark it as merged when the conflict checking is still in progres.

  1. Merge PR A.
  2. Navigate to PR B and merge it, while the conflict checking after the first merge is still in progress.
  3. See that the PR is merged (merge commit exists in the target branch), but the PR is not marked as merged.
  4. The already-merged PR B still shows the "conflict checking still in progress" information

I encountered this on Codeberg, here: https://codeberg.org/Codeberg/Documentation/pulls/211 (the PR was marked as manually merged, but the actual merge happend using the web UI). I couldn't reproduce on try.gitea.io, but I suppose it's a timing issue with the merge conflict checker, I didn't manage to get into a state where I could see the "Conflict checking still in progress window" (but I saw this on Codeberg after B was merged).

CC @Gusted

Gitea Version

1.16.5

Can you reproduce the bug on the Gitea demo site?

No

Log Gist

No response

Screenshots

image

Git Version

No response

Operating System

Debian GNU/Linux

How are you running Gitea?

Codeberg deployment (manually compiled custom fork), run without container on a Debian Linux machine.

Database

MySQL

Originally created by @fnetX on GitHub (Apr 8, 2022). ### Description Merging a pull request on the web UI doesn't mark it as merged when the conflict checking is still in progres. 1. Merge PR A. 2. Navigate to PR B and merge it, while the conflict checking after the first merge is still in progress. 3. See that the PR is merged (merge commit exists in the target branch), but the PR is not marked as merged. 4. The already-merged PR B still shows the "conflict checking still in progress" information I encountered this on Codeberg, here: https://codeberg.org/Codeberg/Documentation/pulls/211 (the PR was marked as manually merged, but the actual merge happend using the web UI). I couldn't reproduce on try.gitea.io, but I suppose it's a timing issue with the merge conflict checker, I didn't manage to get into a state where I could see the "Conflict checking still in progress window" (but I saw this on Codeberg after B was merged). CC @Gusted ### Gitea Version 1.16.5 ### Can you reproduce the bug on the Gitea demo site? No ### Log Gist _No response_ ### Screenshots ![image](https://user-images.githubusercontent.com/19634137/162541509-ad03dfcc-ad83-4028-9b7a-43bbe6413afd.png) ### Git Version _No response_ ### Operating System Debian GNU/Linux ### How are you running Gitea? Codeberg deployment (manually compiled custom fork), run without container on a Debian Linux machine. ### Database MySQL
GiteaMirror added the type/bug label 2025-11-02 08:19:09 -06:00
Sign in to join this conversation.
No Branch/Tag Specified
Branches Tags
Labels
Clear labels
$20
$250
$50
$500
backport/done
💎 Bounty
docs-update-needed
good first issue
hacktoberfest
issue/bounty
issue/confirmed
issue/critical
issue/duplicate
issue/needs-feedback
issue/not-a-bug
issue/regression
issue/stale
issue/workaround
lgtm/need 2
modifies/api
modifies/translation
outdated/backport/v1.18
outdated/theme/markdown
outdated/theme/timetracker
performance/bigrepo
performance/cpu
performance/memory
performance/speed
pr/breaking
proposal/accepted
proposal/rejected
pr/wip
pull-request
Mirrored from GitHub Pull Request
 reviewed/wontfix
💰 Rewarded
skip-changelog
status/blocked
topic/accessibility
topic/api
topic/authentication
topic/build
topic/code-linting
topic/commit-signing
topic/content-rendering
topic/deployment
topic/distribution
topic/federation
topic/gitea-actions
topic/issues
topic/lfs
topic/mobile
topic/moderation
topic/packages
topic/pr
topic/projects
topic/repo
topic/repo-migration
topic/security
topic/theme
topic/ui
topic/ui-interaction
topic/ux
topic/webhooks
topic/wiki
type/bug
type/deprecation
type/docs
type/enhancement
type/feature
type/miscellaneous
type/proposal
type/question
type/refactoring
type/summary
type/testing
type/upstream
No Label type/bug
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
GiteaMirror ninjasurge
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: github-starred/gitea#8804
Delete Branch "%!s()"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?