Skip to content

Git Conflict Anticipator A VS Code extension to automatically detect Git conflicts with a target branch before merging or rebasing.

License

Notifications You must be signed in to change notification settings

CodeSenior/git-anticipator

Repository files navigation

Git Conflict Anticipator

A VS Code extension to automatically detect Git conflicts with a target branch before merging or rebasing.

Features

  • Automatic real-time conflict detection
  • Display of conflicting files in a dedicated view (TreeView)
  • Visual notification + red badge + status bar if conflicts are detected
  • Quick opening of conflicting files
  • Compatible with all local Git branches

Available Commands

  • Git Conflict Anticipator: Set Target Branch — to set the target branch

Screenshot

(add a screenshot here if possible)

Installation

From the VS Code Marketplace, search for git-conflict-anticipator (or install via .vsix).


License

MIT

About

Git Conflict Anticipator A VS Code extension to automatically detect Git conflicts with a target branch before merging or rebasing.

Resources

License

Stars

Watchers

Forks

Packages

No packages published