update

kazupon · kazupon · commit 130fd969c14e · 2020-06-06T00:31:10.000+09:00
diff --git a/ship.config.js b/ship.config.js
@@ -36,7 +36,7 @@ async function commitChangelog(current, next) {
 }
 
 module.exports = {
-  mergeStrategy: { toSameBranch: ['next'] },
+  mergeStrategy: { toSameBranch: ['master'] },
   monorepo: undefined,
   updateChangelog: false,
   beforeCommitChanges: ({ nextVersion, exec, dir }) => {

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ async function commitChangelog(current, next) {`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`module.exports = {`
`39`		`- mergeStrategy: { toSameBranch: ['next'] },`
	`39`	`+ mergeStrategy: { toSameBranch: ['master'] },`
`40`	`40`	`monorepo: undefined,`
`41`	`41`	`updateChangelog: false,`
`42`	`42`	`beforeCommitChanges: ({ nextVersion, exec, dir }) => {`