lenbo
1
When I create a new request in gitea, show me that the merge request has conflicts.
but when I use command
git merge master
in local or use ‘Merge into current’ in IDEA, both of them succeed automatically.
is there anyone can help me? Why does the conflict only exist on gitea.
delvh
2
I’m not certain, but I’d say this is largely due to a combination of two to three things:
- Gitea needs to use bare repos which store (a little bit) less data
- It has access to less merge strategies than a normal repo
- It depends on the system git, which on a server typically gets outdated due to “never change a running system”, so newer improvements can’t be used.
