From 7805d7c2b8fe2db10cf406287335e7a19bb7ed2a Mon Sep 17 00:00:00 2001 From: Mikeal Rogers Date: Tue, 10 Sep 2019 02:54:54 +0000 Subject: [PATCH] fix: try without squash --- merge-release-run.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/merge-release-run.js b/merge-release-run.js index 1a1980b..cc5116d 100644 --- a/merge-release-run.js +++ b/merge-release-run.js @@ -61,7 +61,7 @@ const run = async () => { console.log('new version:', newVersion) exec(`git commit -a --amend --no-edit`) exec(`git checkout master`) - exec(`git merge --squash tmp`) + exec(`git merge tmp`) exec(`git commit --amend -m "${newVersion} published"`) exec(`npm publish --access=public`) exec(`git push merge-release master`)