Skip to content

Release v1.3.0
Compare
Choose a tag to compare
@github-actions github-actions released this 05 Sep 10:14
· 118 commits to main since this release
Immutable release. Only release title and notes can be modified.
1.3.0
40362dc

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

Full Changelog: 1.2.0...1.3.0

Assets 2
Loading