fix: close issue #22

msanguineti · Jul 17, 2019 · fc5399e · fc5399e
1 parent 39a646d
commit fc5399e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/cmds/hotfix/finish.ts b/src/cmds/hotfix/finish.ts
@@ -53,7 +53,7 @@ const handleFinish = async (argv: Arguments): Promise<void> => {
       break
   }
   if (argv.usedev) {
-    exec(`git checkout master`)
+    exec(`git checkout ${argv.main}`)
     exec(`git merge --ff-only ${argv.hotfixName}`)
   }
   switch (argv.deleteBranch) {

diff --git a/src/cmds/release/finish.ts b/src/cmds/release/finish.ts
@@ -56,7 +56,7 @@ const handleFinish = async (argv: Arguments) => {
       break
   }
   if (argv.usedev) {
-    exec(`git checkout master`)
+    exec(`git checkout ${argv.main}`)
     // await git.checkout('master')
     exec(`git merge --ff-only ${argv.release}/${argv.releaseName}`)
     // await git.merge(['--ff-only', `${argv.release}/${argv.releaseName}`])