vndb/mithril-vndb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

v2.0.2

Browse source
This commit is contained in:
Isiah Meadows 2019-07-27 20:29:19 -04:00
parent ad680c6423
commit 9d3ce5fa6d
7 changed files with 151 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

2
scripts/release.js
View file

@ -139,7 +139,7 @@ exec("git", ["checkout", "master"])
exec("git", ["pull", "--rebase", upstream.fetch.branch, "master"])
// There may be merge conflicts with `index.js` and/or the bundle - just ignore
// them. Whatever they have is canon, as is the case with everything else.
exec("git", ["merge", "next", "-s", "theirs"])
exec("git", ["merge", "next", "--strategy-option=theirs"])
rimraf.sync(p("node_modules"))
exec("npm", ["install-test"])