Hi,
We’ve been using gitea for some years now and we love it!
We are currently having an issue relating to merge styles which was triggered by a renovate update. We noticed that renovate was blocking updates to some repos if there was inconsistency between the allowed merge styles and the default merge styles. More specifically, if the default merge style is not an allowed merge style, then the repo is marked as blocked in renovate - the issue is related to this renovate commit: fix(gitea): prefer default merge method by viceice · Pull Request #36779 · renovatebot/renovate · GitHub
Our users create their repos and we are not v prescriptive wrt which settings they choose; this resulted in cases in which the default merge style could be merge but merge was not one of the allowed merge styles (we encourage squash commits but don’t specifically mandate it).
It seems that it is permitted in gitea to have a default merge state which is not an allowed merge stats. Should this be a permitted state? If so, what is the intended/expected behaviour?
Any thoughts/pointers appreciated.
BR,
Sean.