Skip to content

Commit 5b64627

Browse files
committed
RELEASING: Releasing 2 package(s)
Releases: [email protected] @repo/[email protected]
1 parent da0629b commit 5b64627

File tree

6 files changed

+24
-17
lines changed

6 files changed

+24
-17
lines changed

.changeset/hip-lions-carry.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

.changeset/tame-pumas-drop.md

Lines changed: 0 additions & 10 deletions
This file was deleted.

lib/CHANGELOG.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,19 @@
11
# git-json-resolver
22

3+
## 1.3.1
4+
5+
### Patch Changes
6+
7+
- df062c3: Fix logger
8+
- 27daef2: Enhance merge processing and debugging capabilities
9+
- Improve 3-way merge support with proper base handling in merge strategies
10+
- Refactor strategy types and interfaces for better type safety
11+
- Add comprehensive test coverage for merge scenarios and edge cases
12+
- Enhance logger configuration with debug-aware level settings
13+
- Add default backup directory support to backupFile utility
14+
- Improve conflict debugging with structured data when debug mode enabled
15+
- Optimize merge processing with better error handling and validation
16+
317
## 1.3.0
418

519
### Minor Changes

lib/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "git-json-resolver",
33
"author": "Mayank Kumar Chaudhari (https://mayank-chaudhari.vercel.app)",
44
"private": false,
5-
"version": "1.3.0",
5+
"version": "1.3.1",
66
"description": "A rules-based JSON conflict resolver that parses Git conflict markers, reconstructs ours/theirs, and merges with deterministic strategies — beyond line-based merges.",
77
"license": "MPL-2.0",
88
"main": "./dist/index.js",

packages/shared/CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11
# @repo/shared
22

3+
## 0.0.16
4+
5+
### Patch Changes
6+
7+
- Updated dependencies [df062c3]
8+
- Updated dependencies [27daef2]
9+
10+
311
## 0.0.15
412

513
### Patch Changes

packages/shared/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@repo/shared",
3-
"version": "0.0.15",
3+
"version": "0.0.16",
44
"private": true,
55
"sideEffects": false,
66
"main": "./dist/index.js",

0 commit comments

Comments
 (0)