github-starred/gitea
2
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2026-07-11 04:23:04 -05:00
Code Issues 2.6k Packages Projects Releases 100 Wiki Activity

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

New Issue
Closed
opened 2025-11-02 08:01:37 -06:00 by GiteaMirror · 1 comment
GiteaMirror commented 2025-11-02 08:01:37 -06:00
Owner
Copy Link

Originally created by @CirnoT on GitHub (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 f1e85622da0492fa01d8449eb938197cd4fa65bf; last working is 9296baf65a).

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

Screenshots

No response

Originally created by @CirnoT on GitHub (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 f1e85622da0492fa01d8449eb938197cd4fa65bf; last working is 9296baf65a73ccdda329b45770d22390ead7905f). Simplest example can be seen on https://try.gitea.io/Yumaa/kanna/pulls/1 ### Screenshots _No response_
GiteaMirror added the type/bug label 2025-11-02 08:01:37 -06:00
GiteaMirror commented 2025-11-02 08:01:37 -06:00
Author
Owner
Copy Link

@lunny commented on GitHub (Dec 31, 2021):

Maybe @zeripath can help.

@lunny commented on GitHub (Dec 31, 2021): Maybe @zeripath can help.
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#8300
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?