diff --git a/src/main/twirl/pulls/mergeguide.scala.html b/src/main/twirl/pulls/mergeguide.scala.html index b2b84c5..d8f28d1 100644 --- a/src/main/twirl/pulls/mergeguide.scala.html +++ b/src/main/twirl/pulls/mergeguide.scala.html @@ -42,7 +42,7 @@
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 => + @defining(s"git checkout -b ${pullreq.requestUserName}-${pullreq.requestBranch} ${pullreq.branch}"){ command => @helper.html.copy("merge-command-copy-1", command){@command} @@ -62,7 +62,7 @@
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 => + @defining(s"git checkout master\ngit merge ${pullreq.requestUserName}-${pullreq.requestBranch}\ngit push origin ${pullreq.branch}"){ command => @helper.html.copy("merge-command-copy-3", command){@command}