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

[UI] Dont Display File-Conflicts on merged pulls #4812

New Issue
Closed
opened 2025-11-02 06:03:35 -06:00 by GiteaMirror · 6 comments
GiteaMirror commented 2025-11-02 06:03:35 -06:00
Owner
Copy Link

Originally created by @6543 on GitHub (Feb 8, 2020).

gitea version: 1.12.0+dev-251-g d4096ab6a
test url: https://gitea.com/gitea/go-sdk/pulls?q=&type=all&sort=&state=closed&labels=&milestone=0&assignee=0

Bildschirmfoto zu 2020-02-08 12-40-37

Originally created by @6543 on GitHub (Feb 8, 2020). gitea version: 1.12.0+dev-251-g d4096ab6a test url: https://gitea.com/gitea/go-sdk/pulls?q=&type=all&sort=&state=closed&labels=&milestone=0&assignee=0 ![Bildschirmfoto zu 2020-02-08 12-40-37](https://user-images.githubusercontent.com/24977596/74084547-8700f180-4a70-11ea-931b-09cf1f4848a9.png)
GiteaMirror commented 2025-11-02 06:03:36 -06:00
Author
Owner
Copy Link

@bagasme commented on GitHub (Feb 8, 2020):

I disagree.

Should be still on status quo because this informs PR openers to solve the conflicts sooner, given the file count.

@bagasme commented on GitHub (Feb 8, 2020): I disagree. Should be still on status quo because this informs PR openers to solve the conflicts sooner, given the file count.
GiteaMirror commented 2025-11-02 06:03:36 -06:00
Author
Owner
Copy Link

@6543 commented on GitHub (Feb 8, 2020):

@bagasme of ALREADY merged pulls ?!?

@6543 commented on GitHub (Feb 8, 2020): @bagasme of **ALREADY** merged pulls ?!?
GiteaMirror commented 2025-11-02 06:03:37 -06:00
Author
Owner
Copy Link

@bagasme commented on GitHub (Feb 8, 2020):

@6543 AHA! I don't see the context.

Anyway, conflicted files count should only on open PRs, not closed one...

@bagasme commented on GitHub (Feb 8, 2020): @6543 AHA! I don't see the context. Anyway, conflicted files count should only on open PRs, not closed one...
GiteaMirror commented 2025-11-02 06:03:37 -06:00
Author
Owner
Copy Link

@6543 commented on GitHub (Feb 8, 2020):

conflicted files count should only on open PRs, not closed one...

thats exactly what I suggest (mine is more explisit: on merged one ...)

@6543 commented on GitHub (Feb 8, 2020): > conflicted files count should only on open PRs, not closed one... thats exactly what I suggest (mine is more explisit: on merged one ...)
GiteaMirror commented 2025-11-02 06:03:37 -06:00
Author
Owner
Copy Link

@guillep2k commented on GitHub (Feb 8, 2020):

This is not only a UI problem. My question is: why are these values even calculated for merged PRs? PRs can't be re-opened AFAIK.

@guillep2k commented on GitHub (Feb 8, 2020): This is not only a UI problem. My question is: why are these values even calculated for merged PRs? PRs can't be re-opened AFAIK.
GiteaMirror commented 2025-11-02 06:03:37 -06:00
Author
Owner
Copy Link

@zeripath commented on GitHub (Feb 9, 2020):

If I could get #10132 to work after the latest more enforce locking generating the conflicted files should stop happening.

@zeripath commented on GitHub (Feb 9, 2020): If I could get #10132 to work after the latest more enforce locking generating the conflicted files should stop happening.
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
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#4812
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?