marchenko-ia12.ocelot-merge-resolver

Ocelot Merge Resolver

Total downloads

814

7d gain

12

Rolling weekly delta

Rating

- / 5

0 reviews

Version

0.5.0

Latest published

Activity

Extension trends

Manifest

Metadata

Namespace: marchenko-ia12
Name: ocelot-merge-resolver
License: MIT
Homepage: https://github.com/marchenko-ia12/cursor-git-extensions/tree/main/packages/merge-resolver#readme
Repository: https://github.com/marchenko-ia12/cursor-git-extensions.git
Reviews: 0

Taxonomy

Categories

Other SCM Providers

Description

Six-shooter for your git conflicts. JetBrains-style 3-way merge resolver with mini-map, git history per side, and optional AI-assisted suggestions via the Anthropic API.

Archive

Release history

4 latest releases