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

Resolving Pull Request conflicts from web editor #10515

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

Originally created by @antonlnz on GitHub (Mar 25, 2023).

Feature Description

I think it would be a very nice feature to be able to resolve pull request conflicts GitHub style. If I'm not wrong this is not supported right now. This website shows what I am referring to in the "Resolve within GitHub's Web Editor" section. I attach photos anyway

Screenshots

https___rollout io_blog_wp-content_uploads_sites_2_2018_06_resolve-merge-conflict-step1 en tamaño pequeño
https___rollout io_blog_wp-content_uploads_sites_2_2018_06_resolve-merge-conflict-step2 en tamaño pequeño
https___rollout io_blog_wp-content_uploads_sites_2_2018_06_resolve-merge-conflict-step3 en tamaño pequeño
Captura de pantalla 2023-03-25 a las 20 20 07

Originally created by @antonlnz on GitHub (Mar 25, 2023). ### Feature Description I think it would be a very nice feature to be able to resolve pull request conflicts GitHub style. If I'm not wrong this is not supported right now. [This website](https://www.cloudbees.com/blog/resolve-github-merge-conflicts) shows what I am referring to in the "Resolve within GitHub's Web Editor" section. I attach photos anyway ### Screenshots ![https___rollout io_blog_wp-content_uploads_sites_2_2018_06_resolve-merge-conflict-step1 en tamaño pequeño](https://user-images.githubusercontent.com/59964501/227737117-0c32869c-12aa-4dbb-ac25-4051f76e3ce0.jpeg) ![https___rollout io_blog_wp-content_uploads_sites_2_2018_06_resolve-merge-conflict-step2 en tamaño pequeño](https://user-images.githubusercontent.com/59964501/227737148-c7ad324a-e82b-43d1-ba86-dad09db8914c.jpeg) ![https___rollout io_blog_wp-content_uploads_sites_2_2018_06_resolve-merge-conflict-step3 en tamaño pequeño](https://user-images.githubusercontent.com/59964501/227737145-a54c2d16-39a8-4b55-813d-da0f708dc8bd.jpeg) ![Captura de pantalla 2023-03-25 a las 20 20 07](https://user-images.githubusercontent.com/59964501/227737179-69ff5316-6ef9-4c97-bd3e-c020e86db142.png)
GiteaMirror added the type/proposaltype/featureissue/duplicate labels 2025-11-02 09:10:01 -06:00
GiteaMirror commented 2025-11-02 09:10:02 -06:00
Author
Owner
Copy Link

@delvh commented on GitHub (Mar 25, 2023):

Duplicate of at least https://github.com/go-gitea/gitea/issues/9014, and probably others.

@delvh commented on GitHub (Mar 25, 2023): Duplicate of at least https://github.com/go-gitea/gitea/issues/9014, and probably others.
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 type/feature 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#10515
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?