merge-conflict-resolution

Name: merge-conflict-resolution
Rating: 5 (5 reviews)
Author: synaptiai

Detect, classify, and resolve git merge conflicts through structured analysis of conflict markers, per-file strategy selection, and post-resolution verification. Use when a branch has conflicts with its merge target, when rebasing onto an updated base, or when gh-merge detects an unmergeable PR.

5stars

Updated 14 days ago

View on GitHub ↗

How to add

/plugin marketplace add synaptiai/synapti-marketplace

The exact command may vary by repository. Check the README on GitHub.

For the skill author

Drop this on your repo README

Shows your skill is listed on Skillteca, generates a backlink and trackable traffic.

[![Listada na Skillteca](https://www.skillteca.com.br/api/badge/merge-conflict-resolution-synaptiai/svg)](https://www.skillteca.com.br/skills/merge-conflict-resolution-synaptiai?utm_source=badge&utm_medium=readme&utm_campaign=badge)

#git #ai

Related skills

See all in Pesquisa e Web →

dev-browser

60.3k

Automates browser interactions with persistent page state. Use for navigating websites, filling forms, taking screenshots, extracting web data, testing web apps, or automating browser workflows.

Pesquisa e Web#testby code-yeongyu

agent-browser

55.6k

Browser automation CLI for AI agents. Use when the user needs to interact with websites, including navigating pages, filling forms, clicking buttons, taking screenshots, extracting data, testing web apps, or automating any browser task. Triggers include requests to "open a website", "fill out a form", "click a button", "take a screenshot", "scrape data from a page", "test this web app", "login to

Pesquisa e Web#ai#testby shanraisshan

understand-chat

45.5k

Use when you need to ask questions about a codebase or understand code using a knowledge graph.

Pesquisa e Webby Lum1104

understand-dashboard

45.5k

Launch the interactive web dashboard to visualize a codebase's knowledge graph.

Pesquisa e Webby Lum1104

Category alert

Get new Pesquisa e Web skills every Monday

One short email with only the new Pesquisa e Web skills. 4 minutes of reading, no spam, unsubscribe with one click.

You confirm your email on the first send. No spam. Unsubscribe with one click.

Merge Conflict Resolution

Domain skill for detecting, classifying, and resolving git merge conflicts systematically.

Iron Law

NEVER silently drop changes. Every conflict resolution must account for both sides. If lines from either side are excluded, the rationale must be documented. When in doubt, ask the user rather than guess.

Conflict Detection

Detect conflicted files and their conflict types:

# List files with unmerged entries
git diff --name-only --diff-filter=U

#

[Description truncada. Veja o README completo no GitHub.]

ShareX LinkedIn

Comments · No comments

No comments yet. Be the first.