search

go-gitea / gitea

Git with a cup of tea! Painless self-hosted all-in-one software development service, including Git hosting, code review, team collaboration, package registry and CI/CD
https://gitea.com
MIT License
44.18k stars 5.42k forks source link

When will merge conflict resolution be supported? #32087

Open jeremyzhong7 opened 5 hours ago

jeremyzhong7 commented 5 hours ago

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

lunny commented 4 hours ago

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

jeremyzhong7 commented 1 hour ago

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

OK, thanks