Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Resolving Pull Request conflicts from web editor #23705

Closed
antonlnz opened this issue Mar 25, 2023 · 1 comment
Closed

Resolving Pull Request conflicts from web editor #23705

antonlnz opened this issue Mar 25, 2023 · 1 comment
Labels
issue/duplicate The issue has already been reported. type/feature Completely new functionality. Can only be merged if feature freeze is not active. type/proposal The new feature has not been accepted yet but needs to be discussed first.

Comments

@antonlnz
Copy link

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
@antonlnz antonlnz added type/feature Completely new functionality. Can only be merged if feature freeze is not active. type/proposal The new feature has not been accepted yet but needs to be discussed first. labels Mar 25, 2023
@delvh
Copy link
Member

delvh commented Mar 25, 2023 •
edited
Loading

Duplicate of at least #9014, and probably others.

@delvh delvh closed this as not planned Won't fix, can't repro, duplicate, stale Mar 25, 2023
@delvh delvh added the issue/duplicate The issue has already been reported. label Mar 25, 2023
@go-gitea go-gitea locked and limited conversation to collaborators May 3, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Assignees
No one assigned
Labels
issue/duplicate The issue has already been reported. type/feature Completely new functionality. Can only be merged if feature freeze is not active. type/proposal The new feature has not been accepted yet but needs to be discussed first.
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
2 participants
@delvh @antonlnz