more updates

kazupon · kazupon · commit 9241313fbabb · 2021-10-18T19:18:48.000+09:00
diff --git a/ship.config.js b/ship.config.js
@@ -40,7 +40,7 @@ async function commitChangelog(current, next) {
 }
 
 module.exports = {
-  mergeStrategy: { toSameBranch: ['master'] },
+  mergeStrategy: { toSameBranch: ['main'] },
   monorepo: undefined,
   updateChangelog: false,
   installCommand: () => 'pnpm install --silent',

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ async function commitChangelog(current, next) {`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`module.exports = {`
`43`		`- mergeStrategy: { toSameBranch: ['master'] },`
	`43`	`+ mergeStrategy: { toSameBranch: ['main'] },`
`44`	`44`	`monorepo: undefined,`
`45`	`45`	`updateChangelog: false,`
`46`	`46`	`installCommand: () => 'pnpm install --silent',`