newspack-scripts 3.0.0-alpha.2 → 3.0.0-alpha.3

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 +2 -1
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "newspack-scripts",
3
- "version": "3.0.0-alpha.2",
3
+ "version": "3.0.0-alpha.3",
4
4
  "description": "",
5
5
  "bin": {
6
6
  "newspack-scripts": "./bin/newspack-scripts.js"
package/post-release.sh CHANGED
@@ -26,7 +26,8 @@ fi
26
26
  # Update master branch with latest changes from the release branch, so they are in sync.
27
27
  echo '[newspack-scripts] Merging the release branch into master'
28
28
  git checkout master
29
- git merge --squash release
29
+ # Merge release branch into master branch, prefering the changes from release branch if conflicts arise.
30
+ git merge --squash release --strategy-option=theirs
30
31
  git commit --message "chore(release): merge in release $LATEST_VERSION_TAG"
31
32
  # Push updated master upstream.
32
33
  git push "https://$GITHUB_TOKEN@github.com/$CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME.git"