@(status: gitbucket.core.service.PullRequestService.MergeStatus, issue: gitbucket.core.model.Issue, pullreq: gitbucket.core.model.PullRequest, originRepository: gitbucket.core.service.RepositoryService.RepositoryInfo, forkedRepository: gitbucket.core.service.RepositoryService.RepositoryInfo)(implicit context: gitbucket.core.controller.Context) @import gitbucket.core.view.helpers
@status.conflictMessage.map { message => @helpers.markdown( markdown = message, repository = originRepository, branch = originRepository.repository.defaultBranch, enableWikiLink = false, enableRefsLink = true, enableLineBreaks = false ) }
@pullreq.branch
into this branch.@if(status.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.
} @gitbucket.core.helper.html.copy("repository-url", "repository-url-copy", forkedRepository.httpUrl){Step 1: From your project repository, check out a new branch and test the changes.
@helpers.pre { git checkout -b @{pullreq.requestUserName}-@{pullreq.requestBranch} @{pullreq.branch} git pull @{forkedRepository.httpUrl} @{pullreq.requestBranch} }Step 2: Merge the changes and update on the server.
@helpers.pre { git checkout @{pullreq.branch} git merge --no-ff @{pullreq.requestUserName}-@{pullreq.requestBranch} git push origin @{pullreq.branch} }