@(issue: model.Issue,
pullreq: model.PullRequest,
comments: List[model.IssueComment],
collaborators: List[String],
milestones: List[(model.Milestone, Int, Int)],
hasConflict: Boolean,
hasWritePermission: Boolean,
repository: service.RepositoryService.RepositoryInfo,
requestRepositoryUrl: String)(implicit context: app.Context)
@import context._
@import view.helpers._
@issues.html.issuedetail(issue, comments, collaborators, milestones, hasWritePermission, repository)
@issues.html.commentlist(issue, comments, hasWritePermission, repository, Some(pullreq))
@if(hasWritePermission && !issue.closed){
}
@issues.html.commentform(issue, hasWritePermission, repository)
@if(issue.closed) {
@if(comments.exists(_.action == "merge")){
Merged
} else {
Closed
}
} else {
Open
}
@comments.size @plural(comments.size, "comment")
@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.requestBranch}"){ 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 master\ngit merge ${pullreq.requestUserName}-${pullreq.branch}\ngit push origin ${pullreq.branch}"){ command => @helper.html.copy("merge-command-copy-3", command){ } }