@(hasConflict: Boolean, hasProblem: Boolean, issue: model.Issue, pullreq: model.PullRequest, statuses: List[model.CommitStatus], repository: service.RepositoryService.RepositoryInfo, requestRepositoryUrl: String)(implicit context: app.Context) @import context._ @import view.helpers._ @import model.CommitState
@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 lineIf 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){ } }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){ } }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){ } }