diff --git a/src/cmds/hotfix/finish.ts b/src/cmds/hotfix/finish.ts index 58f33197..cb5a5f99 100644 --- a/src/cmds/hotfix/finish.ts +++ b/src/cmds/hotfix/finish.ts @@ -53,7 +53,7 @@ const handleFinish = async (argv: Arguments): Promise => { 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 index 444f1572..2a0b228b 100644 --- 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}`])