You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
gitea/routers
a1012112796 9633f336c8
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>
6 months ago
..
api Fix RPM resource leak (#31794) 6 months ago
common Refactor route path normalization (#31381) 8 months ago
install Refactor names (#31405) 8 months ago
private Fix protected branch files detection on pre_receive hook (#31778) 6 months ago
utils Refactor external URL detection (#29973) 11 months ago
web Add warning message in merge instructions when `AutodetectManualMerge` was not enabled (#31805) 6 months ago
init.go Refactor names (#31405) 8 months ago