From d7a573c75fc5809c17905e05501ea62a53b474c9 Mon Sep 17 00:00:00 2001
From: wxiaoguang <wxiaoguang@gmail.com>
Date: Mon, 24 Apr 2023 01:21:20 +0800
Subject: [PATCH] add comments for Manually Merged feature

---
 templates/repo/issue/view_content/pull.tmpl | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/templates/repo/issue/view_content/pull.tmpl b/templates/repo/issue/view_content/pull.tmpl
index 8b758b2ac09a4..3a2f933503f41 100644
--- a/templates/repo/issue/view_content/pull.tmpl
+++ b/templates/repo/issue/view_content/pull.tmpl
@@ -456,6 +456,15 @@
 				{{end}}
 			{{end}}{{/* end if: pull request status */}}
 
+			{{/*
+			Manually Merged is not a well-known feature, it helps repo admins to mark a non-mergeable PR (already merged, conflicted) as merged
+			To test it:
+			* Enable "Manually Merged" feature in the Repository Settings
+			* Create a pull request, either:
+			* - Merge the pull request branch locally and push the merged commit to Gitea
+			* - Make some conflicts between the base branch and the pull request branch
+			* Then the Manually Merged form will be shown to repo admin users
+			*/}}
 			{{if and $.StillCanManualMerge (not $showGeneralMergeForm)}}
 				<div class="ui divider"></div>
 				<div class="ui form">