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>

2024-08-10 01:09:34 +00:00

..

api

Fix RPM resource leak (#31794)

2024-08-08 09:43:04 +00:00

common

Refactor route path normalization (#31381)

2024-06-17 23:28:47 +00:00

install

Refactor names (#31405)

2024-06-19 06:32:45 +08:00

private

Fix protected branch files detection on pre_receive hook (#31778)

2024-08-06 13:32:49 +00:00

utils

Refactor external URL detection (#29973)

2024-03-22 04:32:40 +08:00

web

Add warning message in merge instructions when AutodetectManualMerge was not enabled (#31805)

2024-08-10 01:09:34 +00:00

init.go

Refactor names (#31405)

2024-06-19 06:32:45 +08:00