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
Related topics
Topic
Replies
Views
Activity
Merge request has conflicts on gitea, but success in local
Install/Maintain/Configure
1
2818
November 16, 2022
Content in local branche and new pull request differ
Install/Maintain/Configure
5
591
November 29, 2019
Merge conflict checking is in progress stucks
General
0
20
May 22, 2025
Build server error merge conflict
General
0
785
February 13, 2022
Cannot delete PDF file trough pull request
Install/Maintain/Configure
2
475
April 1, 2020
