resolve-conflicts
Surgical merge conflict resolution — understand original commit intent and apply minimum necessary changes
Install
/plugin install resolve-conflicts@tomitribeRun it inside Claude Code after adding the marketplace with /plugin marketplace add tomitribe/claude-plugins.
Sponsors
Promote your product hereReach 125k+ visitors monthlyPromote your product hereReach 125k+ visitors monthly
Agent CaffeineSponsoredClose your lid, come back to finished work
SnugSponsoredThe clipboard manager for the AI eraPromote your product hereReach 125k+ visitors monthly
WaxSponsoredBlock anything with supervision, without erasing your iPhonePromote your product hereReach 125k+ visitors monthly
knobsSponsoredSee your site on any phone, any day, in any language
Agent CaffeineSponsoredClose your lid, come back to finished workSnugSponsoredThe clipboard manager for the AI eraPromote your product hereReach 125k+ visitors monthlyWaxSponsoredBlock anything with supervision, without erasing your iPhonePromote your product hereReach 125k+ visitors monthlyknobsSponsoredSee your site on any phone, any day, in any languageDetails
- Marketplace
- tomitribe/claude-plugins
- Source
- plugins/resolve-conflicts
- Category
- Community