0
0
mirror of https://github.com/go-gitea/gitea.git synced 2025-01-19 00:29:08 +01:00
gitea/routers/web/repo
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
..
actions
setting
activity.go
attachment.go
blame.go
branch.go
cherry_pick.go
code_frequency.go
commit.go
compare.go
contributors.go
download.go
editor_test.go
editor.go
find.go
fork.go
githttp_test.go
githttp.go
helper_test.go
helper.go
issue_content_history.go
issue_dependency.go
issue_label_test.go
issue_label.go
issue_lock.go
issue_pin.go
issue_stopwatch.go
issue_test.go
issue_timetrack.go
issue_watch.go
issue.go Add warning message in merge instructions when AutodetectManualMerge was not enabled (#31805) 2024-08-10 01:09:34 +00:00
main_test.go
middlewares.go
migrate.go
milestone.go
packages.go
patch.go
projects_test.go
projects.go
pull_review_test.go
pull_review.go
pull.go
recent_commits.go
release_test.go
release.go
render.go
repo.go
search_test.go
search.go
topic.go
treelist.go
view_test.go
view.go
wiki_test.go
wiki.go