diff --git a/src/main/twirl/gitbucket/core/pulls/mergeguide.scala.html b/src/main/twirl/gitbucket/core/pulls/mergeguide.scala.html index 7a10072..d8713e0 100644 --- a/src/main/twirl/gitbucket/core/pulls/mergeguide.scala.html +++ b/src/main/twirl/gitbucket/core/pulls/mergeguide.scala.html @@ -112,20 +112,19 @@

Step 1: From your project repository, check out a new branch and test the changes.

- @defining(s"git checkout -b ${pullreq.requestUserName}-${pullreq.requestBranch} ${pullreq.branch}\n" + - s"git pull ${forkedRepository.httpUrl} ${pullreq.requestBranch}"){ command => - @gitbucket.core.helper.html.copy("merge-command", "merge-command-copy-1", command, "position: absolute; right: 31px;")() -
@Html(command)
+ @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.

- @defining(s"git checkout ${pullreq.branch}\ngit merge --no-ff ${pullreq.requestUserName}-${pullreq.requestBranch}\n" + - s"git push origin ${pullreq.branch}"){ command => - @gitbucket.core.helper.html.copy("merge-command-2", "merge-command-copy-2", command, "position: absolute; right: 31px;")() -
@command
+ @helpers.pre { + git checkout @{pullreq.branch} + git merge --no-ff @{pullreq.requestUserName}-@{pullreq.requestBranch} + git push origin @{pullreq.branch} }