skills.rest
marcocpt
marcocptCOMMUNITY
Explore all skills by this author →
GitHub

dd-git-conflict

Resolves Git merge conflicts using branch isolation, file locks, and conflict prediction.

Updated Jun 11, 2026
Search Tags:#git#multi-agent#merge conflict#code collaboration#branching strategy#conflict prediction#public files
One-click install
npx skills add https://github.com/marcocpt/trae_skills --skill dd-git-conflict-marcocpt
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: dd-git-conflict
Source: https://github.com/marcocpt/trae_skills/tree/main/dd-git-conflict
Command: npx skills add https://github.com/marcocpt/trae_skills --skill dd-git-conflict-marcocpt

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve? Multi-agent and long-lived branch development frequently produces merge conflicts, especially on shared public files, leading to broken merges, force-push chaos, and blocked pipelines. This Skill defines a disciplined conflict-handling workflow so conflicts are resolved on feature branches, never directly on develop. ## Core Features & Use Cases - Structured Conflict Resolution Flow: Enforces a merge-only strategy (no rebase) where conflicts are resolved on the feature branch before merging into develop. - Priority-Based Resolution: Classifies files into P0-P3 priorities, with public files (Package.swift, Podfile.lock, shared protocols) handled first via dedicated short-lived branches. - Public File Lock Mechanism: Maintains a queryable manifest (.trae/public-files.txt) so agents must open independent refactor/public-file-* branches with PublicFile tags when touching shared files. - Conflict Prediction: Requires each agent to output a conflict prediction report before starting work, using a conflict-predict.sh script that rates severity as high, medium, or low. - Use Case: When two AI agents modify the same Package.swift and Router.swift on parallel feature branches, this Skill routes the public file changes through a dedicated branch merged within one day, then sequences the remaining module-scoped merges Core → UI → App. ## Quick Start Ask the AI to run the conflict prediction script against the develop branch and then resolve any reported merge conflicts on the current feature branch following the priority rules.

Frequently Asked Questions about dd-git-conflict

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

FAQPage Schema
How do I resolve Git merge conflicts on long-lived feature branches?▼

Merge origin/develop into your feature branch, resolve conflicts there, commit the resolution, run pre-merge checks, then merge the feature branch into develop. Never resolve conflicts directly on develop, and use merge instead of rebase to avoid force-push issues.

What is a public file lock mechanism in Git workflows?▼

A public file lock requires that changes to shared files like Package.swift or Podfile.lock happen on a dedicated refactor/public-file-* branch with a PublicFile tag in the commit message. The branch must merge to develop within one day so other agents can sync.

Should I use rebase or merge for long-running feature branches?▼

Use merge for long-running branches in multi-agent setups. Rebase rewrites history and causes force-push conflicts when multiple agents share branches, while merge preserves the true development trajectory and avoids interactive conflict resolution.

How can I predict merge conflicts before starting work?▼

Run the conflict-predict.sh script against the base branch to generate a ConflictPredictionReport JSON. It compares your planned file changes with other active branches and rates severity: high (over 5 files) blocks merging, medium (3-5) needs manual confirmation, low (2 or fewer) can merge with annotation.

What are the limitations of this conflict handling approach?▼

The workflow assumes a develop/feature branch model and requires discipline around the public file manifest, which is maintained manually by project owners. It does not automate the actual conflict resolution content, only the process and sequencing around it.

Related Skills

Explore More Software Engineering Skills→
acaprinoacaprino
6

parallel-feature-development

Coordinate parallel feature development across agents with file ownership boundaries.

Community
Advanced
qol-toolsqol-tools

plugin-alt-tab-release-flow

Enforce release commit and tag patterns for plugin-alt-tab CI workflows.

Official
Advanced
leodyversemilla07leodyversemilla07

git-workflow

Enforce conventional commit messages and branch naming conventions in Git workflows.

Community
Basic
kieranpottskieranpotts

merge

Integrates work between Git branches using the merge strategy matching their branch types.

Community
Advanced