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

gitea merge request conflict handling online #9803

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

Originally created by @Clownsw on GitHub (Nov 8, 2022).

Feature Description

I found that gitea seems to be unable to handle merges after creating merge request conflicts, I wonder if gitea can have the same merge processing capabilities as github

Screenshots

No response

Originally created by @Clownsw on GitHub (Nov 8, 2022). ### Feature Description I found that gitea seems to be unable to handle merges after creating merge request conflicts, I wonder if gitea can have the same merge processing capabilities as github ### Screenshots _No response_
GiteaMirror added the issue/duplicate label 2025-11-02 08:50:03 -06:00
GiteaMirror commented 2025-11-02 08:50:04 -06:00
Author
Owner
Copy Link

@kdumontnu commented on GitHub (Nov 8, 2022):

Duplicate of https://github.com/go-gitea/gitea/issues/9014

Please let me know if this is closed in error and we can reopen. Otherwise, feel free to add your support to the ongoing efforts towards implementing this feature.

@kdumontnu commented on GitHub (Nov 8, 2022): Duplicate of https://github.com/go-gitea/gitea/issues/9014 Please let me know if this is closed in error and we can reopen. Otherwise, feel free to add your support to the ongoing efforts towards implementing this feature.
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 issue/duplicate
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#9803
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?