gitea/templates/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
branch
cite
code
diff
editor Code editor theme enhancements (#31629) 2024-07-14 23:22:48 +00:00
find
graph Always use HTML attributes for avatar size (#31509) 2024-06-28 21:29:15 +00:00
issue Add warning message in merge instructions when AutodetectManualMerge was not enabled (#31805) 2024-08-10 01:09:34 +00:00
migrate
projects
pulls
release
settings Allow force push to protected branches (#28086) 2024-07-05 18:21:56 +00:00
tag
wiki
activity.tmpl
blame.tmpl
branch_dropdown.tmpl
clone_buttons.tmpl
clone_script.tmpl
code_frequency.tmpl
commit_load_branches_and_tags.tmpl
commit_page.tmpl
commit_status.tmpl
commit_statuses.tmpl
commits_list_small.tmpl
commits_list.tmpl
commits_search_dropdown.tmpl
commits_table.tmpl
commits.tmpl
contributors.tmpl
create_helper.tmpl
create.tmpl
empty.tmpl
file_info.tmpl
forks.tmpl
graph.tmpl
header.tmpl
home.tmpl
icon.tmpl
latest_commit.tmpl
navbar.tmpl
packages.tmpl
pulse.tmpl
recent_commits.tmpl
release_tag_header.tmpl
search_name.tmpl
search.tmpl
shabox_badge.tmpl Always use HTML attributes for avatar size (#31509) 2024-06-28 21:29:15 +00:00
star_unstar.tmpl
sub_menu.tmpl
unicode_escape_prompt.tmpl
upload.tmpl
user_cards.tmpl Always use HTML attributes for avatar size (#31509) 2024-06-28 21:29:15 +00:00
view_file.tmpl
view_list.tmpl
watch_unwatch.tmpl
watchers.tmpl