merge-conflicts

Included with Lifetime

$97 forever

Resolves git merge conflicts by analyzing intent from both sides. Use when merge conflicts are detected or when git operations fail with conflict errors.

General

What this skill does


# Merge Conflicts

## Process

1. **Detect conflicted files:** `git status` — look for "both modified" / "both added"

2. **For each conflicted file:**

   **Read and understand intent:**
   - Read the FULL file, not just conflict sections
   - Use `git log -p --follow -- path/to/file` to see recent history
   - Use `git blame path/to/file` to understand why each side made changes
   - Determine: what problem does HEAD solve? What problem does incoming solve? Are they compatible?

   **Classify and resolve:**

   **Compatible changes** (different additions, merged imports) → auto-resolve, keep both
   - Confidence: High
   - Example: different methods added to same class, `import { A, B }` vs `import { A, C }` → `import { A, B, C }`

   **Overlapping changes** (same logic modified differently) → combine if possible, explain reasoning
   - Confidence: Medium — explain reasoning, may flag for review
   - Example: two different optimizations of same function

   **Incompatible changes** (mutually exclusive) → do NOT auto-resolve
   - Confidence: Low — explain both options, recommend one, flag for manual review
   - Example: one side disabled a feature for security, other side enhanced it

3. **Apply resolution:**
   - Write resolved file without conflict markers
   - Verify resolved code is syntactically valid
   - Stage resolved file: `git add path/to/file`

4. **Report per file:**
   ```
   File: path/to/file
   Strategy: Compatible / Overlapping / Incompatible
   Reasoning:
     - HEAD: <what it was trying to do>
     - Incoming: <what it was trying to do>
     - Resolution: <how both intents were preserved>
   Confidence: High / Medium / Low
   Status: Auto-resolved / Needs review
   ```

5. **Provide next steps:**
   - Files staged and ready
   - Files needing manual review
   - How to complete: `git commit` or `git merge --continue`
   - How to abort: `git merge --abort` or `git rebase --abort`

## Constraints

- ALWAYS read full file and git history before resolving — never resolve based on conflict markers alone
- ALWAYS explain reasoning with "HEAD wanted X, incoming wanted Y" language
- ALWAYS state confidence level honestly per file
- Be conservative — prefer flagging for review over incorrect auto-resolution
- Never guess at business logic
- Never complete the merge/rebase automatically — only stage resolved files
- Never lose functionality from either side without explaining the tradeoff

Files: 1

Size: 2.6 KB

Complexity: 6/100

Category: General

Source: https://github.com/racurry/neat-little-package/tree/main/plugins/dmv/skills/merge-conflicts

Related in General

modeling-omnistudio-epc-catalog

Included

Salesforce Industries CME EPC product-modeling skill for Product2-based catalog creation. Use when creating EPC products, configuring product attributes, building offer bundles with Product Child Items, or reviewing EPC DataPack JSON metadata for product catalog changes. TRIGGER when: user creates or updates Product2 EPC records, AttributeAssignment payloads, AttributeMetadata/AttributeDefaultValues, Offer bundles, or ProductChildItem relationships. DO NOT TRIGGER when: designing OmniScripts/FlexCards/Integration Procedures (use building-omnistudio-omniscript, building-omnistudio-flexcard, or building-omnistudio-integration-procedure), implementing Apex business logic (use generating-apex), or troubleshooting deployment pipelines (use deploying-metadata).

Generalscripts

relationship-science-coach

Included

Use this skill for direct, practical adult relationship coaching: couples conflict, repair, trust, marriage, dating, flirting, attachment patterns, emotional connection, sex, desire differences, eroticism, kink negotiation, affection, love languages, breakups, and long-term passion. Draw on Gottman, EFT and Hold Me Tight, attachment science, modern sex research, Perel, Nagoski, Kerner, Schnarch, Love and Stosny, and flexible love-language tools. Be concrete and low-hedge. Redirect only for imminent danger, abuse, coercive control, minors, non-consent, self-harm, stalking, or medical/legal/psychiatric decisions.

Generalscripts

building-sf-integrations

Included

Salesforce integration architecture and runtime plumbing with 120-point scoring. Use this skill to set up Named Credentials, External Credentials, External Services, REST/SOAP callout patterns, Platform Events, and Change Data Capture. TRIGGER when: user sets up Named Credentials, External Services, REST/SOAP callouts, Platform Events, CDC, or touches .namedCredential-meta.xml files. DO NOT TRIGGER when: Connected App/OAuth config (use configuring-connected-apps), Apex-only logic (use generating-apex), or data import/export (use handling-sf-data).

Generalscripts

venue-templates

Included

Access comprehensive LaTeX templates, formatting requirements, and submission guidelines for major scientific publication venues (Nature, Science, PLOS, IEEE, ACM), academic conferences (NeurIPS, ICML, CVPR, CHI), research posters, and grant proposals (NSF, NIH, DOE, DARPA). This skill should be used when preparing manuscripts for journal submission, conference papers, research posters, or grant proposals and need venue-specific formatting requirements and templates.

Generalscripts

let-fate-decide

Included

Draws the 12 Houses of the Zodiac Tarot spread to inject entropy into planning when prompts are vague, ambiguous, or casually delegated. Interprets the spread to guide next steps. Use when the user says 'let fate decide', 'YOLO', 'whatever', 'idk', or other nonchalant phrases, makes Yu-Gi-Oh references, or when you are about to arbitrarily pick between multiple reasonable approaches. Prefer over ask-questions-if-underspecified when the user's tone is casual or playful rather than precision-seeking.

Generalscripts

net-ops

Included

Cross-platform network troubleshooting (Windows, macOS, Linux) via local or remote shell. Use for: DNS broken, can't resolve hostnames, nslookup/dig works but apps fail, NRPT, WFP, scutil, /etc/resolver, systemd-resolved, /etc/resolv.conf, NetworkManager, VPN DNS leak residue (ProtonVPN/Mullvad/WireGuard/AnyConnect), AV/firewall blocking DNS or DoH, Tailscale DNS interaction, intermittent connectivity, remote diagnostics over SSH.

Generalscripts