Skip to content

Commit b2248d2

Browse files
authored
Add comments for Manually Merged feature (#24291)
In case I would forget it again one day .....
1 parent 70bb498 commit b2248d2

File tree

1 file changed

+9
-0
lines changed

1 file changed

+9
-0
lines changed

templates/repo/issue/view_content/pull.tmpl

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -455,6 +455,15 @@
455455
{{end}}
456456
{{end}}{{/* end if: pull request status */}}
457457

458+
{{/*
459+
Manually Merged is not a well-known feature, it helps repo admins to mark a non-mergeable PR (already merged, conflicted) as merged
460+
To test it:
461+
* Enable "Manually Merged" feature in the Repository Settings
462+
* Create a pull request, either:
463+
* - Merge the pull request branch locally and push the merged commit to Gitea
464+
* - Make some conflicts between the base branch and the pull request branch
465+
* Then the Manually Merged form will be shown to repo admin users
466+
*/}}
458467
{{if and $.StillCanManualMerge (not $showGeneralMergeForm)}}
459468
<div class="ui divider"></div>
460469
<div class="ui form">

0 commit comments

Comments
 (0)