From f1ac2b3507e6c45fe1ba848741d35a03dcaea63b Mon Sep 17 00:00:00 2001
From: bati11 <mail.bati11@gmail.com>
Date: Tue, 20 Jan 2015 23:23:40 +0900
Subject: [PATCH] Change checkout branch name from "master" to
 ${pullreq.branch}

---
 src/main/twirl/pulls/mergeguide.scala.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/twirl/pulls/mergeguide.scala.html b/src/main/twirl/pulls/mergeguide.scala.html
index e859794db..7ea24deb3 100644
--- a/src/main/twirl/pulls/mergeguide.scala.html
+++ b/src/main/twirl/pulls/mergeguide.scala.html
@@ -62,7 +62,7 @@
     <p>
       <span class="strong">Step 3:</span> Merge the changes and update the server
     </p>
-    @defining(s"git checkout master\ngit merge ${pullreq.requestUserName}-${pullreq.requestBranch}\ngit push origin ${pullreq.branch}"){ command =>
+    @defining(s"git checkout ${pullreq.branch}\ngit merge ${pullreq.requestUserName}-${pullreq.requestBranch}\ngit push origin ${pullreq.branch}"){ command =>
       @helper.html.copy("merge-command-copy-3", command){
         <pre style="width: 500px; float: left;">@command</pre>
       }