mirror of https://github.com/go-gitea/gitea
Add warning message in merge instructions when `AutodetectManualMerge` was not enabled (#31805)
not enabled quick-f-i-x https://github.com/go-gitea/gitea/issues/31433 ? , maybe need more disscusion about better solutions. example view: ![image](https://github.com/user-attachments/assets/2af7e1e8-42b9-4473-89c7-12d4a9205d3f) adtion notes about how to enable `AutodetectManualMerge` ![image](https://github.com/user-attachments/assets/28f84317-367a-40d8-b50d-a19ef7c664d4) Signed-off-by: a1012112796 <1012112796@qq.com>pull/31781/head^2
parent
df27846628
commit
9633f336c8
Loading…
Reference in new issue