resolve-conflicts

Merge target branch changes into a feature branch with conflict resolution and verification.

Updated Jul 3, 2026

Search Tags:#automation #git #version control #merge #conflict resolution #ci-cd

Ready to run

npx skills add https://github.com/ohyesgocool/feature-loop --skill resolve-conflicts-ohyesgocool

💬 Prompt for ChatGPT / Claude Chat▼

Please help me install this Agent Skill.
Skill: resolve-conflicts
Source: https://github.com/ohyesgocool/feature-loop/tree/main/skills/resolve-conflicts
Command: npx skills add https://github.com/ohyesgocool/feature-loop --skill resolve-conflicts-ohyesgocool

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

This skill resolves complex git merge conflicts automatically while maintaining the integrity of review threads, migration sequences, and project logic, preventing the common pitfalls of manual rebasing.

Core Features & Use Cases

Intelligent Conflict Resolution: Automatically handles lockfiles, migrations, and additive lists using context-aware strategies rather than simple text merging.
Verification Gates: Performs semantic scans and re-verifies features to ensure that resolved code remains functional and logically sound.
Use Case: When a feature branch falls behind the main target branch, this skill integrates the changes, resolves conflicts, and validates the result, allowing the developer to merge without losing review context or breaking the build.

Quick Start

Use the resolve-conflicts skill to integrate the current target branch into your active feature branch and verify the result.

Frequently Asked Questions about resolve-conflicts

High-intent search queries and answers about installing and using this skill.

FAQPage Schema

How do I resolve git merge conflicts without rebasing and losing review thread anchors?▼

To resolve git merge conflicts without rebasing, you can perform non-rebase merges that integrate target branch changes into a feature branch while preserving commit history and review thread anchors for continuous validation.

What is the best way to automate lockfile regeneration and conflict resolution in CI/CD pipelines?▼

Automating lockfile regeneration and conflict resolution in CI/CD pipelines requires intelligent, context-aware merges that classify git conflicts, apply non-rebase strategies, and semantically verify merged code to prevent logic regressions.

Can I integrate target branch changes into a feature branch without breaking the build?▼

Yes, integrating target branch changes into a feature branch can validate the result by applying automated lockfile regeneration and semantic verification gates, ensuring resolved code remains functional and the build does not break.

When do I need non-rebase merges for version control instead of standard rebasing?▼

You need non-rebase merges for version control when maintaining linear history or review continuity is critical, such as when preserving migration sequences and review thread anchors during automated CI/CD developer workflows.

Why does automated conflict resolution fail to preserve migration sequences during manual rebasing?▼

Manual rebasing fails to preserve migration sequences because it alters commit history, whereas intelligent non-rebase merges apply context-aware strategies to safely integrate changes while maintaining migration integrity and project logic.

Does this automated conflict resolution approach handle additive lists and lockfiles differently from text merging?▼

Yes, unlike simple text merging, this approach handles lockfiles, migrations, and additive lists using context-aware strategies, performing git-based conflict classification and semantic verification to ensure no logic regressions occur.