Skip to content

Commit 9fb935a

Browse files
committed
Apply changesets and update CHANGELOG [skip ci]
1 parent 91efccb commit 9fb935a

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

lib/README.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ import { resolveConflicts } from "git-json-resolver";
6464
// Option 1: Use factory function with custom config
6565
const plugin = createSemverPlugin({
6666
strict: false,
67-
fallback: "ours"
67+
fallback: "ours",
6868
});
6969

7070
await resolveConflicts({
@@ -75,7 +75,7 @@ await resolveConflicts({
7575
},
7676
});
7777

78-
// Option 2: Use individual strategy exports
78+
// Option 2: Use individual strategy exports - not scoped @see migration guide for more details
7979
await resolveConflicts({
8080
customStrategies: {
8181
"semver-max": semverMax,
@@ -126,11 +126,11 @@ export default config;
126126
import createSemverPlugin from "git-json-resolver-semver";
127127

128128
const plugin = createSemverPlugin({
129-
strict: true, // Use validateStrict for exact semver only
130-
preferValid: true, // Prefer valid semver when only one side is valid
131-
fallback: "continue", // Behavior when both sides invalid
132-
preferRange: false, // Future: merge into semver ranges
133-
workspacePattern: "" // Pattern for workspace rules
129+
strict: true, // Use validateStrict for exact semver only
130+
preferValid: true, // Prefer valid semver when only one side is valid
131+
fallback: "continue", // Behavior when both sides invalid
132+
preferRange: false, // Future: merge into semver ranges
133+
workspacePattern: "", // Pattern for workspace rules
134134
});
135135
```
136136

@@ -140,8 +140,8 @@ const plugin = createSemverPlugin({
140140
import { init } from "git-json-resolver-semver";
141141

142142
init({
143-
strict: false, // Allow prereleases and ranges
144-
fallback: "ours"
143+
strict: false, // Allow prereleases and ranges
144+
fallback: "ours",
145145
});
146146
```
147147

0 commit comments

Comments
 (0)