@(hasConflict: Boolean, pullreq: gitbucket.core.model.PullRequest, requestRepositoryUrl: String)(implicit context: gitbucket.core.controller.Context) @import context._ @import gitbucket.core.view.helpers._
@if(hasConflict){ We can’t automatically merge this pull request. } 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", requestRepositoryUrl){ }

Step 1: Check out a new branch to test the changes — run this from your project directory

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

    @command

} }

Step 2: Bring in @{pullreq.requestUserName}'s changes and test

@defining(s"git pull ${requestRepositoryUrl} ${pullreq.requestBranch}"){ command => @helper.html.copy("merge-command-copy-2", command){

    @command

} }

Step 3: Merge the changes and update the server

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

    @command

} }