Skip to content

Commit

Permalink
Add comments for Manually Merged feature (#24291)
Browse files Browse the repository at this point in the history
In case I would forget it again one day .....
  • Loading branch information
wxiaoguang committed Apr 23, 2023
1 parent 70bb498 commit b2248d2
Showing 1 changed file with 9 additions and 0 deletions.
9 changes: 9 additions & 0 deletions templates/repo/issue/view_content/pull.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -455,6 +455,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">
Expand Down

0 comments on commit b2248d2

Please sign in to comment.