Skip to content

Release v1.1.0
Compare
Choose a tag to compare
@github-actions github-actions released this 29 Aug 12:23
· 173 commits to main since this release
Immutable release. Only release title and notes can be modified.
1.1.0
1c52250

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:

    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.

Full Changelog: 1.0.0...1.1.0

Assets 2
Loading