newspack-scripts 3.1.1-alpha.1 → 3.1.1-alpha.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (2) hide show
  1. package/package.json +1 -1
  2. package/post-release.sh +1 -2
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "newspack-scripts",
3
- "version": "3.1.1-alpha.1",
3
+ "version": "3.1.1-alpha.2",
4
4
  "description": "",
5
5
  "bin": {
6
6
  "newspack-scripts": "./bin/newspack-scripts.js"
package/post-release.sh CHANGED
@@ -35,7 +35,6 @@ fi
35
35
  echo '[newspack-scripts] Merging the release branch into master'
36
36
  git checkout master
37
37
  # Merge release branch into master branch, prefering the changes from release branch if conflicts arise.
38
- git merge release --strategy-option=theirs
39
- git commit --message "chore(release): merge in release $LATEST_VERSION_TAG"
38
+ git merge --no-ff release --strategy-option=theirs -m "chore(release): merge in release $LATEST_VERSION_TAG"
40
39
  # Push updated master upstream.
41
40
  git push "https://$GITHUB_TOKEN@github.com/$CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME.git"