fix: back out checkin

Author: mikeal

merge-release-run.js

@@ -52,19 +52,13 @@ const run = async () => {
 
   const exec = str => process.stdout.write(execSync(str))
 
-  exec(`git checkout -b tmp`)
-
   let current = execSync(`npm view ${pkg.name} version`).toString()
   exec(`npm version --allow-same-version=true --git-tag-version=false ${current} `)
   console.log('current:', current, '/', 'version:', version)
   let newVersion = execSync(`npm version --git-tag-version=false ${version}`).toString()
   console.log('new version:', newVersion)
-  exec(`git commit -a --amend --no-edit`)
-  exec(`git checkout master`)
-  exec(`git merge tmp`)
-  exec(`git commit --amend -m "${newVersion}"`)
   exec(`npm publish --access=public`)
-  exec(`git push merge-release master`)
+  exec(`git checkout package.json`) // cleanup
   exec(`git tag ${newVersion}`)
   exec(`git push merge-release --tags`)
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "merge-release",
-  "version": "4.0.5",
+  "version": "0.0.0-dev",
   "description": "",
   "scripts": {
     "test": "standard"