From cba24fa67e6ad8c87191f6a99671e88d84226b4b Mon Sep 17 00:00:00 2001
From: Mikeal Rogers <mikeal.rogers@gmail.com>
Date: Tue, 10 Sep 2019 02:54:54 +0000
Subject: [PATCH] fix: try without squash

---
 merge-release-run.js | 2 +-
 package.json         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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`)
diff --git a/package.json b/package.json
index a1195de..a5e3609 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "merge-release",
-  "version": "4.0.3",
+  "version": "4.0.5",
   "description": "",
   "scripts": {
     "test": "standard"