@(hasConflict: Boolean, hasProblem: Boolean, issue: gitbucket.core.model.Issue, pullreq: gitbucket.core.model.PullRequest, statuses: List[model.CommitStatus], originRepository: gitbucket.core.service.RepositoryService.RepositoryInfo, forkedRepository: gitbucket.core.service.RepositoryService.RepositoryInfo)(implicit context: gitbucket.core.controller.Context) @import gitbucket.core.service.SystemSettingsService @import context._ @import gitbucket.core.view.helpers._ @import model.CommitState
@if(!statuses.isEmpty){
@if(statuses.size==1){ @defining(statuses.head){ status =>
@status.targetUrl.map{ url => Details } @commitStateIcon(status.state) @commitStateText(status.state, pullreq.commitIdTo) @status.description.map{ desc => — @desc }
} } else { @defining(statuses.groupBy(_.state)){ stateMap => @defining(CommitState.combine(stateMap.keySet)){ state =>
@commitStateIcon(state) @commitStateText(state, pullreq.commitIdTo) — @{stateMap.map{ case (keyState, states) => states.size+" "+keyState.name }.mkString(", ")} checks
@statuses.map{ status =>
@status.targetUrl.map{ url => Details } @commitStateIcon(status.state) @status.context @status.description.map{ desc => — @desc }
}
} } }
}
@if(hasConflict){ We can’t automatically merge this pull request. } else { @if(hasProblem){ Merge with caution! } else { This pull request can be automatically merged. } }
@if(hasConflict){ Use the command line to resolve conflicts before continuing. } else { You can also merge branches on the command line. }

@if(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.

} @helper.html.copy("repository-url-copy", forkedRepository.httpUrl, true){
@if(settings.ssh && loginAccount.isDefined){
}
}

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

@defining(s"git checkout -b ${pullreq.requestUserName}-${pullreq.requestBranch} ${pullreq.branch}\n" + s"git pull ${forkedRepository.httpUrl} ${pullreq.requestBranch}"){ command => @helper.html.copy("merge-command-copy-1", command){

    @Html(command)

} }

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

@defining(s"git checkout ${pullreq.branch}\ngit merge --no-ff ${pullreq.requestUserName}-${pullreq.requestBranch}\n" + s"git push origin ${pullreq.branch}"){ command => @helper.html.copy("merge-command-copy-2", command){

    @command

} }
Merge pull request #@issue.issueId from @{pullreq.requestUserName}/@{pullreq.requestBranch}
@issue.title