q-code-merge-conflicts
Resolve an in-progress Git merge or rebase conflict by preserving compatible intent, validating the merged result, and stopping before any unauthorized…
Skill by flaviogragnolati
Install
Works with Claude Code, Claude apps, Codex, Cursor, Gemini CLI, GitHub Copilot, VS Code, OpenCode, Goose, Windsurf. Read the repository before you give any tool access to your data.
npx agentmarket install skill/flaviogragnolati-q-code-merge-conflicts
Asks which of your tools to add it to (Claude Code, Codex, Cursor, VS Code, Windsurf, Gemini CLI, Claude Desktop) and shows the change first. See https://agentmart.dev/cli.
Get the weekly diff
The weekly diff: one email a week with new agent tools, notable updates and grade changes, plus security alerts for tools you follow. Double opt-in, one-click unsubscribe.
About
Use cases: documents
Reviews
Write a reviewNo reviews yet. Installed it? Reviews come from verified installers only. How reviews work
Permissions
What this skill can do and what it asks for, from its SKILL.md. Checked Oct 25, 2026.
- Tools
- No tools found
- Secrets
- None asked for
- Install scripts
- None found
Network hosts it talks to 1
codeload.github.com· found in install command
Files it touches
~/.claude/skills/q-code-merge-conflicts
What's inside
- Skill name
q-code-merge-conflicts- Description
- Resolve an in-progress Git merge or rebase conflict by preserving compatible intent, validating the merged result, and stopping before any unauthorized staging, continuation, commit, abort, push, or cleanup. Use when a Quasar project has actual unmerged paths or a paused merge/rebase; do not use for ordinary code review, speculative merge planning, or a semantic conflict that requires the user to choose behavior. Requires the q-core-contract companion.
- License
- NOASSERTION
- Instructions
- 25 lines in SKILL.md · view on GitHub
Files (2)
- SKILL.md
- openai.yaml · agents/
The license isn't open source, so the instructions aren't shown here. Read SKILL.md on GitHub
More from flaviogragnolati/ai-workflow
- 0.524score
q-consult-engagement-plan
flaviogragnolati
Turn an accepted Quasar proposal or engagement agreement into the engagement plan for consulting execution: objectives and success measures, workstreams…
SkillBFreshness: BClaude Code +9 - 0.524score
q-code-debug
flaviogragnolati
Diagnose and fix reproducible or hard failures in a codebase using evidence, ranked hypotheses, focused tests, and proportional project validation.
SkillBFreshness: BClaude Code +9 - 0.524score
q-consult-acceptance
flaviogragnolati
Run deliverable acceptance for a Quasar consulting engagement: present each deliverable at an exact version against its proposal acceptance criteria, capture…
SkillBFreshness: BClaude Code +9 - 0.519score
q-code-handoff
flaviogragnolati
Create a structured, redacted workspace handoff that lets a fresh agent continue without conversation history.
SkillBFreshness: BClaude Code +9 - 0.519score
q-ask-project
flaviogragnolati
Answer factual or explanatory questions about a project's intent, documentation, workflow state, decisions, and observable implementation by reconciling the…
SkillBFreshness: BClaude Code +9 - 0.519score
q-code-explore
flaviogragnolati
Explore a codebase, targeted module or feature, or document and return a transient high-level summary grounded in inspected evidence.
SkillBFreshness: BClaude Code +9 - 0.519score
q-code-implement
flaviogragnolati
Execute settled work from a ready backlog item, issue, ticket, or implementation plan.
SkillBFreshness: BClaude Code +9 - 0.519score
q-code-implementation-plan
flaviogragnolati
Produce a concrete, repository-grounded execution plan for settled work without writing code.
SkillBFreshness: BClaude Code +9 - 0.519score
q-code-tdd
flaviogragnolati
Test-driven development through a red → green loop and the rules that make it produce tests worth keeping.
SkillBFreshness: BClaude Code +9 - 0.519score
q-consult-current-state
flaviogragnolati
Assess a client's current state for a Quasar consulting engagement: map as-is processes, roles, hand-offs, systems, controls, metrics, and pain points from…
SkillBFreshness: BClaude Code +9 - 0.519score
q-code-tickets
flaviogragnolati
Optionally convert settled work into durable, traceable tickets for multiple executors, sessions, or tracker coordination.
SkillBFreshness: BClaude Code +9 - 0.519score
q-code-grill-feature
flaviogragnolati
Align a bounded but non-trivial feature through a dialogue and end with a durable execution-ready implementation plan.
SkillBFreshness: BClaude Code +9
Signals
- Stars
- 0
- Forks
- 0
- Open issues
- 0
- Last commit (this folder)
- Aug 14, 2026 (2 months ago)
From GitHub (fetched Oct 24, 2026).
Details
- License
- NOASSERTION
- Repository
- github.com/flaviogragnolati/ai-workflow
- First seen
- Oct 24, 2026
- Last checked
- Oct 24, 2026
- Source
- GitHubgithub-graphql
More from flaviogragnolati
- 0.524score
q-code-debug
flaviogragnolati
Diagnose and fix reproducible or hard failures in a codebase using evidence, ranked hypotheses, focused tests, and proportional project validation.
SkillBFreshness: BClaude Code +9 - 0.524score
q-consult-engagement-plan
flaviogragnolati
Turn an accepted Quasar proposal or engagement agreement into the engagement plan for consulting execution: objectives and success measures, workstreams…
SkillBFreshness: BClaude Code +9 - 0.524score
q-consult-acceptance
flaviogragnolati
Run deliverable acceptance for a Quasar consulting engagement: present each deliverable at an exact version against its proposal acceptance criteria, capture…
SkillBFreshness: BClaude Code +9 - 0.519score
q-code-grill-feature
flaviogragnolati
Align a bounded but non-trivial feature through a dialogue and end with a durable execution-ready implementation plan.
SkillBFreshness: BClaude Code +9 - 0.519score
q-code-explore
flaviogragnolati
Explore a codebase, targeted module or feature, or document and return a transient high-level summary grounded in inspected evidence.
SkillBFreshness: BClaude Code +9 - 0.519score
q-ask-project
flaviogragnolati
Answer factual or explanatory questions about a project's intent, documentation, workflow state, decisions, and observable implementation by reconciling the…
SkillBFreshness: BClaude Code +9
Cite this page
q-code-merge-conflicts skill. Agent Mart. https://agentmart.dev/skills/flaviogragnolati-q-code-merge-conflicts (last updated 2026-10-24)