You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
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
The text was updated successfully, but these errors were encountered:
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
The text was updated successfully, but these errors were encountered: