RELEASING: Releasing 2 package(s)

Releases:
  [email protected]
  @repo/[email protected]

Author: mayank1513

.changeset/git-integration-and-path-fixes.md

@@ -1,5 +1,16 @@
 # git-json-resolver
 
+## 1.3.0
+
+### Minor Changes
+
+- 54de9e1: Add Git integration for 3-way merge support and fix file path handling
+  - Add base content support to ParsedConflict interface for 3-way merges
+  - Integrate Git commands to fetch base and ours content when parsing conflicts
+  - Make filename parameter required in ParseConflictOptions for Git operations
+  - Fix file path handling in utils to return relative paths instead of absolute paths
+  - Improve conflict detection for cases where ours and theirs are identical
+
 ## 1.2.0
 
 ### Minor Changes

lib/CHANGELOG.md

@@ -2,7 +2,7 @@
   "name": "git-json-resolver",
   "author": "Mayank Kumar Chaudhari (https://mayank-chaudhari.vercel.app)",
   "private": false,
-  "version": "1.2.0",
+  "version": "1.3.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",

lib/package.json

@@ -1,5 +1,12 @@
 # @repo/shared
 
+## 0.0.15
+
+### Patch Changes
+
+- Updated dependencies [54de9e1]
+  - [email protected]
+
 ## 0.0.14
 
 ### Patch Changes

packages/shared/CHANGELOG.md

@@ -1,6 +1,6 @@
 {
   "name": "@repo/shared",
-  "version": "0.0.14",
+  "version": "0.0.15",
   "private": true,
   "sideEffects": false,
   "main": "./dist/index.js",