Skip to content
cccskills
FreePublished on GitHub

resolving-merge-conflicts

Resolve an in-progress Git merge or rebase conflict while preserving the relevant intent of both sides. Use when conflict markers or an interrupted merge/rebase need investigation and resolution.

The English summary is being prepared. Showing the original description.

See how to install

Files included (2)

  • SKILL.md1.3 KB
  • agents/openai.yaml113 B

SKILL.md (original)

Review the instructions the agent will receive before you install.

Resolve Merge Conflicts

  1. Inspect the current Git state, the operation in progress, its goal, and every conflicting file.
  2. Reconstruct each side's intent from the code, nearby tests, history, commit messages, and linked work items that are available and useful.
  3. Resolve each hunk by preserving compatible intent. Where intents conflict, prefer the merge's stated goal and current repository contracts; avoid inventing unrelated behavior.
  4. Run focused checks for the affected surface, then broader checks when risk or repository guidance warrants them.
  5. Unless the user requested advice or review only, stage resolved files and continue the current merge or rebase when it is safe to do so. Report what was resolved, what was verified, and any remaining uncertainty.

Pause rather than guess when neither intent can be preserved safely. Aborting or restarting can be the correct recovery when the base is wrong, the operation is contaminated, or the user prefers a clean retry; explain the trade-off before taking that destructive step.

Reviews

No reviews yet. Tell others what you thought.

Comments

No login needed. Share how it worked for you, ask a question, or note where it did not run.

No comments yet. Be the first to write one.

Comments are published right away. Do not include personal information such as email addresses or phone numbers. Up to 2 URLs.

0 / 1,000 characters

This form is protected by reCAPTCHA, and the Google Privacy Policy and Terms of Service apply.

More skills from this repository

Create or review an AGENTS.md file so coding agents get stable repo-local instructions: environment setup, testing, style, security boundaries, PR policy, and handoff rules. Use when a repo lacks durable agent guidance or when a custom harness needs a predictable context file.

The English summary is being prepared. Showing the original description.

stevesolun/ctx588Updated Oct 15, 2026

Recommend the smallest Matt Pocock skill or short skill sequence that fits the user's current goal.

The English summary is being prepared. Showing the original description.

stevesolun/ctx588Updated Oct 15, 2026

Decision guide for delegating to caveman-style subagents. Tells the main thread WHEN to spawn `cavecrew-investigator` (locate code), `cavecrew-builder` (1-2 file edit), or `cavecrew-reviewer` (diff review) instead of doing the work inline or using vanilla `Explore`. Subagent output is caveman-compressed so the tool-result injected back into main context is ~60% smaller — main context lasts longer across long sessions. Trigger: "delegate to subagent", "use cavecrew", "spawn investigator/builder/reviewer", "save context", "compressed agent output".

The English summary is being prepared. Showing the original description.

stevesolun/ctx588Updated Oct 15, 2026

Ultra-compressed communication mode. Cuts token usage ~75% by dropping filler, articles, and pleasantries while keeping full technical accuracy. Use when user says "caveman mode", "talk like caveman", "use caveman", "less tokens", "be brief", or invokes /caveman.

The English summary is being prepared. Showing the original description.

stevesolun/ctx588Updated Oct 15, 2026

Ultra-compressed communication mode. Cuts token usage ~75% by speaking like caveman while keeping full technical accuracy. Supports intensity levels: lite, full (default), ultra, wenyan-lite, wenyan-full, wenyan-ultra. Use when user says "caveman mode", "talk like caveman", "use caveman", "less tokens", "be brief", or invokes /caveman. Also auto-triggers when token efficiency is requested.

The English summary is being prepared. Showing the original description.

stevesolun/ctx588Updated Oct 15, 2026

Ultra-compressed commit message generator. Cuts noise from commit messages while preserving intent and reasoning. Conventional Commits format. Subject ≤50 chars, body only when "why" isn't obvious. Use when user says "write a commit", "commit message", "generate commit", "/commit", or invokes /caveman-commit. Auto-triggers when staging changes.

The English summary is being prepared. Showing the original description.

stevesolun/ctx588Updated Oct 15, 2026

See all skills by stevesolun

Report a problem with this skill