@(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){
@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.

}
HTTP

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

    git checkout -b @{pullreq.requestUserName}-@{pullreq.requestBranch} @{pullreq.requestBranch}

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

    git pull @{requestRepositoryUrl} @{pullreq.requestBranch}

Step 3: Merge the changes and update the server

    git checkout master
    git merge @{pullreq.requestUserName}-@{pullreq.branch}
    git push origin @{pullreq.branch}

Merge pull request #@issue.issueId from @{pullreq.requestUserName}/@{pullreq.requestBranch}
@issue.title
} @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")