a1012112796andGitHub 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 <[email protected]>

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

..

gitignore

[skip ci] Updated licenses and gitignores

2024-06-17 00:27:39 +00:00

label

Add missing exclusive in advanced label options (#28322)

2024-01-22 07:56:17 +00:00

license

[skip ci] Updated licenses and gitignores

2024-08-05 00:28:44 +00:00

locale

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

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

readme

Bindata is optional and over-writable on restart (#354)

2016-12-22 19:12:23 +01:00