Gitea
Gitea可否在线处理合并冲突
中文求助(Chinese Only)
BuZhisheng999
June 6, 2024, 7:29am
1
gitea如何在线处理合并冲突，如果无法在线处理，应如何解决合并冲突问题
image
978×156 4.99 KB
sanguinedab
March 14, 2025, 12:12pm
2
兄弟有找到方法吗，因为我的main是受保护分支，我不想在本地merge
lunny
May 1, 2026, 7:27pm
3
目前还没有支持这个功能。。。。。。。。。。。
Related topics
Topic
Replies
Views
Activity
Merge request has conflicts on gitea, but success in local
Install/Maintain/Configure
1
3057
November 16, 2022
Can I resolve PR merge conflicts using only the Gitea API or web UI?
General
1
77
May 1, 2026
Content in local branche and new pull request differ
Install/Maintain/Configure
5
621
November 29, 2019
Merge conflict checking is in progress stucks
General
0
117
May 22, 2025
Build server error merge conflict
General
0
809
February 13, 2022
