@@ -64,7 +64,7 @@ import { resolveConflicts } from "git-json-resolver";
64
64
// Option 1: Use factory function with custom config
65
65
const plugin = createSemverPlugin ({
66
66
strict: false ,
67
- fallback: " ours"
67
+ fallback: " ours" ,
68
68
});
69
69
70
70
await resolveConflicts ({
@@ -75,7 +75,7 @@ await resolveConflicts({
75
75
},
76
76
});
77
77
78
- // Option 2: Use individual strategy exports
78
+ // Option 2: Use individual strategy exports - not scoped @see migration guide for more details
79
79
await resolveConflicts ({
80
80
customStrategies: {
81
81
" semver-max" : semverMax ,
@@ -126,11 +126,11 @@ export default config;
126
126
import createSemverPlugin from " git-json-resolver-semver" ;
127
127
128
128
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
134
134
});
135
135
```
136
136
@@ -140,8 +140,8 @@ const plugin = createSemverPlugin({
140
140
import { init } from " git-json-resolver-semver" ;
141
141
142
142
init ({
143
- strict: false , // Allow prereleases and ranges
144
- fallback: " ours"
143
+ strict: false , // Allow prereleases and ranges
144
+ fallback: " ours" ,
145
145
});
146
146
```
147
147
0 commit comments