RELEASING: Releasing 2 package(s)

mayank1513 · mayank1513 · commit ab74a4d0a2e7 · 2025-08-29T17:53:05.000+05:30
Releases:
  git-json-resolver@1.1.0
  @repo/shared@0.0.13
diff --git a/.changeset/cuddly-cases-cover.md b/.changeset/cuddly-cases-cover.md
diff --git a/.changeset/git-merge-driver.md b/.changeset/git-merge-driver.md
diff --git a/lib/CHANGELOG.md b/lib/CHANGELOG.md
@@ -1,5 +1,27 @@
 # git-json-resolver
 
+## 1.1.0
+
+### Minor Changes
+
+- 33df0e7: Export utils for custom strategies. Add autoAdd config option
+- 537f127: Add Git merge driver support and improve architecture
+  - **New feature**: CLI now supports Git merge driver mode when called with 3 positional arguments (%A %O %B)
+  - **Refactored**: Extracted common merge logic into reusable `processMerge` utility (DRY principle)
+  - **Testing**: Added comprehensive unit tests for merge-processor module
+  - **Backward compatible**: Existing CLI workflows continue to work unchanged
+  - **Auto-detection**: Automatically detects Git merge mode vs. standard conflict resolution mode
+  - **Full configuration**: All existing config options (rules, strategies, matchers) work in Git merge mode
+  - **Exit codes**: Proper Git merge driver exit codes (0 for success, 1 for conflicts)
+
+  Usage:
+
+  ```bash
+  git config merge.json-resolver.driver "npx git-json-resolver %A %O %B"
+  ```
+
+  This enables automatic JSON conflict resolution during Git merges using the same powerful rule-based strategies.
+
 ## 1.0.0
 
 ### Major Changes
diff --git a/lib/package.json b/lib/package.json
@@ -2,7 +2,7 @@
   "name": "git-json-resolver",
   "author": "Mayank Kumar Chaudhari (https://mayank-chaudhari.vercel.app)",
   "private": false,
-  "version": "1.0.0",
+  "version": "1.1.0",
   "description": "A rules-based JSON conflict resolver that parses Git conflict markers, reconstructs ours/theirs, and merges with deterministic strategies — beyond line-based merges.",
   "license": "MPL-2.0",
   "main": "./dist/index.js",
diff --git a/packages/shared/CHANGELOG.md b/packages/shared/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @repo/shared
 
+## 0.0.13
+
+### Patch Changes
+
+- Updated dependencies [33df0e7]
+- Updated dependencies [537f127]
+  - git-json-resolver@1.1.0
+
 ## 0.0.12
 
 ### Patch Changes
diff --git a/packages/shared/package.json b/packages/shared/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@repo/shared",
-  "version": "0.0.12",
+  "version": "0.0.13",
   "private": true,
   "sideEffects": false,
   "main": "./dist/index.js",

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@repo/shared",`
`3`		`- "version": "0.0.12",`
	`3`	`+ "version": "0.0.13",`
`4`	`4`	`"private": true,`
`5`	`5`	`"sideEffects": false,`
`6`	`6`	`"main": "./dist/index.js",`