@@ -30,6 +30,7 @@
 	],
 	"postUpdateOptions": ["pnpmDedupe"],
 	"rangeStrategy": "bump",
+	"rebaseWhen": "conflicted",
 	"vulnerabilityAlerts": {
 		"labels": ["security"]
 	}
Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,7 @@`
`30`	`30`	`],`
`31`	`31`	`"postUpdateOptions": ["pnpmDedupe"],`
`32`	`32`	`"rangeStrategy": "bump",`
	`33`	`+ "rebaseWhen": "conflicted",`
`33`	`34`	`"vulnerabilityAlerts": {`
`34`	`35`	`"labels": ["security"]`
`35`	`36`	`}`