fix(git): also checkout master branch to properly merge

conveyal · Nov 29, 2018 · dc3aee4 · dc3aee4
1 parent 533d963
commit dc3aee4
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/lib/git.js b/lib/git.js
@@ -62,6 +62,11 @@ async function mergeMasterIntoDev (context) {
   // fetch everything
   await execa('git', ['fetch'], execaOpts)
 
+  // checkout master branch
+  // this is done because otherwise the commit seems to be the one just before
+  // the snapshot release
+  await execa('git', ['checkout', branch], execaOpts)
+
   // checkout dev branch
   await execa('git', ['checkout', devBranch], execaOpts)