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

When will merge conflict resolution be supported? #32087

Open
jeremyzhong7 opened this issue Sep 20, 2024 · 1 comment
Open

When will merge conflict resolution be supported? #32087

jeremyzhong7 opened this issue Sep 20, 2024 · 1 comment
Labels
type/proposal The new feature has not been accepted yet but needs to be discussed first.

Comments

@jeremyzhong7
Copy link

Feature Description

When working as a team, PR is important for us. I merge 2 branches, it will notice me "This pull request has changes conflicting with the target branch.". I found Gitea does not yet support merge conflict resolution after I read https://docs.gitea.com/next/installation/comparison. Are there any other solutions?

Screenshots

image
image
@jeremyzhong7 jeremyzhong7 added the type/proposal The new feature has not been accepted yet but needs to be discussed first. label Sep 20, 2024
@lunny
Copy link
Member

lunny commented Sep 20, 2024

You can resolve the conflict in your local worktree. Gitea doesn't support resolving the conflict online at the moment.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
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
@lunny @jeremyzhong7