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

[Enhancement request] Pull Request page: Files Changed tab: highlight conflicting files #13471

New Issue
Open
opened 2025-11-02 10:43:23 -06:00 by GiteaMirror · 0 comments
GiteaMirror commented 2025-11-02 10:43:23 -06:00
Owner
Copy Link

Originally created by @kuraga on GitHub (Sep 7, 2024).

Feature Description

Good day!

On the Pull Request page, at the Conversation tab, there are notes about the files' merge conflicts.

The proposition: to highlight the corresponding files at the Files Changed tab.
(Verbose, if possible.)

Thanks!

Screenshots

No response

Originally created by @kuraga on GitHub (Sep 7, 2024). ### Feature Description Good day! On the Pull Request page, at the `Conversation` tab, there are notes about the files' merge conflicts. The proposition: to highlight the corresponding files at the `Files Changed` tab. (Verbose, if possible.) Thanks! ### Screenshots _No response_
GiteaMirror added the type/proposal label 2025-11-02 10:43:23 -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/proposal
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#13471
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?