@(status: gitbucket.core.service.PullRequestService.MergeStatus, issue: gitbucket.core.model.Issue, pullreq: gitbucket.core.model.PullRequest, originRepository: gitbucket.core.service.RepositoryService.RepositoryInfo, forkedRepository: gitbucket.core.service.RepositoryService.RepositoryInfo)(implicit context: gitbucket.core.controller.Context) @import gitbucket.core.view.helpers
@if(!status.statuses.isEmpty){
@defining(status.commitStateSummary){ case (summaryState, summary) => @helpers.commitStateIcon(summaryState) @helpers.commitStateText(summaryState, pullreq.commitIdTo) — @summary checks }
@status.statusesAndRequired.map { case (status, required) =>
@if(required){ Required } @status.targetUrl.map { url => Details }
@helpers.commitStateIcon(status.state) @status.context @status.description.map { desc => — @desc }
}
}
@if(status.hasConflict){
This branch has conflicts that must be resolved
@if(status.hasMergePermission){ Use the command line to resolve conflicts before continuing. } else { Only those with write access to this repository can merge pull requests. }
} else { @if(status.branchIsOutOfDate){ @if(status.hasUpdatePermission){
}
This branch is out-of-date with the base branch
Merge the latest changes from `@pullreq.branch` into this branch.
} else { @if(status.hasRequiredStatusProblem) {
Required statuses must pass before merging.
All required status checks on this pull request must run successfully to enable automatic merging.
} else {
@if(status.hasMergePermission){ Merging can be performed automatically.
Merging can be performed automatically.
} else { This branch has no conflicts with the base branch.
Only those with write access to this repository can merge pull requests.
} } } }
@if(status.hasMergePermission){
You can also merge branches on the command line.

@if(status.hasConflict){ Checkout via command line

If you cannot merge a pull request automatically here, you have the option of checking it out via command line to resolve conflicts and perform a manual merge.

} else { Merging via command line

If you do not want to use the merge button or an automatic merge cannot be performed, you can perform a manual merge on the command line.

} @gitbucket.core.helper.html.copy("repository-url", "repository-url-copy", forkedRepository.httpUrl){
HTTP @if(context.settings.ssh && context.loginAccount.isDefined){ SSH }
}

Step 1: From your project repository, check out a new branch and test the changes.

@helpers.pre { git checkout -b @{pullreq.requestUserName}-@{pullreq.requestBranch} @{pullreq.branch} git pull @{forkedRepository.httpUrl} @{pullreq.requestBranch} }

Step 2: Merge the changes and update on the server.

@helpers.pre { git checkout @{pullreq.branch} git merge --no-ff @{pullreq.requestUserName}-@{pullreq.requestBranch} git push origin @{pullreq.branch} }
}
Merge pull request #@issue.issueId from @{pullreq.requestUserName}/@{pullreq.requestBranch}
@issue.title