diff --git a/src/main/twirl/helper/copy.scala.html b/src/main/twirl/helper/copy.scala.html new file mode 100644 index 0000000..1cba6e6 --- /dev/null +++ b/src/main/twirl/helper/copy.scala.html @@ -0,0 +1,36 @@ +@(id: String, value: String)(html: Html) +
+ @html + +
+ \ No newline at end of file diff --git a/src/main/twirl/pulls/discussion.scala.html b/src/main/twirl/pulls/discussion.scala.html index e55aa25..da2d4d0 100644 --- a/src/main/twirl/pulls/discussion.scala.html +++ b/src/main/twirl/pulls/discussion.scala.html @@ -49,24 +49,39 @@ you can perform a manual merge on the command line.

} -
- HTTP + @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){ +
@command
+ } + }
-

- 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}
+
+

+ 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){ +
@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){ +
@command
+ } + } +