diff options
author | a1012112796 <1012112796@qq.com> | 2024-08-10 09:09:34 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-08-10 01:09:34 +0000 |
commit | 9633f336c87947dc7d2a5e76077a10699ba5e50d (patch) | |
tree | 190890b651f82e757d9746dde8c6528c9c79c6ab /web_src/js/features/stopwatch.ts | |
parent | df27846628fc0a8a20f59fc60ca4e0107585ea05 (diff) | |
download | gitea-9633f336c87947dc7d2a5e76077a10699ba5e50d.tar.gz gitea-9633f336c87947dc7d2a5e76077a10699ba5e50d.zip |
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>
Diffstat (limited to 'web_src/js/features/stopwatch.ts')
0 files changed, 0 insertions, 0 deletions