Skip to content

v1.0.0

Choose a tag to compare

View all tags
@kaisumi kaisumi released this 20 Jun 06:18
· 10 commits to main since this release
v1.0.0
ea065bb

Summary

Initial stable release of Conflict Resolution Diff.

This VS Code extension helps review conflict resolution changes by showing only the diff introduced while resolving conflicts.

Features

  • Show uncommitted conflict resolution diffs using AUTO_MERGE
  • Show resolved conflict diffs from a merge commit SHA using git show --remerge-diff
  • Open conflict resolution diffs in a VS Code editor
  • Provide commands from the Command Palette and the Activity Bar view

Safety

  • Validates merge commit SHA input before running Git commands
  • Disables external diff drivers and text conversion when generating diffs

Installation

Install from the Visual Studio Marketplace:

https://marketplace.visualstudio.com/items?itemName=kaisumi.conflict-resolution-diff

Assets 3
Loading