carterdea/merge-conflicts
agents/skills/merge-conflicts/SKILL.md
Rebase current branch onto main/master, resolve merge conflicts, and force-push
$ install --global
skillsauthnpx skillsauth add carterdea/dots merge-conflictsInstall this skill globally with one command. Works with Claude Code, Cursor, and Windsurf.
Security Scan Results
3 of 9 scanners reported clean
Some scanners were skipped, did not run, or reported a non-clean status. Review each row below.
3
Scanners Passed
9
Scanners in report
Clean
TrivyContainer and dependency vulnerability scanner
95%
Clean
SemgrepStatic code analysis for vulnerabilities
95%
Clean
mcp-scan (Snyk)Model Context Protocol security validation
95%
Skipped
Snyk (dep)Open source security scanning
50%
Skipped
Socket.devSupply chain security analysis
50%
Skipped
VirusTotalMulti-engine malware detection
50%
Skipped
CrowdStrikeAdvanced threat intelligence
50%
Skipped
OSV-ScannerOpen Source Vulnerability database check
50%
Skipped
OWASP Dep-Check
50%
Last scanned: Apr 20, 2026, 3:28 AM8.6s1 file scanned
SKILL.md
- name:
- merge-conflicts
- description:
- Rebase current branch onto main/master, resolve merge conflicts, and force-push
- user-invocable:
- true
Merge Conflicts
Rebase the current branch onto the default branch, resolve any merge conflicts, and push.
Steps
- Identify the default branch and current branch
git branch --show-current
git remote show origin | grep 'HEAD branch' | awk '{print $NF}'
- If on the default branch: stop — nothing to rebase.
- Fetch latest and start rebase
git fetch origin
git rebase origin/<default-branch>
-
If rebase succeeds cleanly — skip to step 5.
-
If there are merge conflicts:
- Run
git diff --name-only --diff-filter=Uto list conflicted files - Read each conflicted file fully (1500+ lines) to understand both sides
- Resolve conflicts by choosing the correct code — prefer incoming (main) for dependency/config changes, prefer ours (feature) for new feature code
- After resolving each file:
git add <file> - Continue:
git rebase --continue - Repeat until rebase completes
- If a conflict is ambiguous, stop and ask before resolving
- Force-push the rebased branch
git push --force-with-lease origin HEAD
- Report
- Which branch was rebased onto which
- How many conflicts were resolved (if any)
- Which files had conflicts and how they were resolved
Rules
- Never use
git rebase --abortunless the user asks - Never use
git push --force— always--force-with-lease - Never modify files beyond what is needed to resolve the conflict
- If the rebase produces test failures, report them — do not silently fix unrelated code
Related Skills
carterdea/simple-html-artifact
tools
VerifiedTrustedCommunity
Build or refine single-file information-first HTML artifacts, especially index.html or text.html pages, with strong information hierarchy, restrained styling, accessible semantics, and minimal AI-generated frontend tells. Use when creating HTML reports, research pages, explainers, briefs, dashboards, note indexes, annotated code reviews, planning/spec docs, or focused single-purpose editing/triage tools with copy-out export — front ends whose goal is comprehension or action rather than marketing conversion. Reach for this whenever the user wants a standalone HTML page, report, one-pager, explainer, or "quick HTML" to present or organize information, even if they just say "make an HTML file" without mentioning design. Not for multi-page sites, React/framework apps, or marketing landing pages.
1SKILL.mdUpdated Jun 6, 2026
carterdea/trello-delivery
development
VerifiedTrustedCommunity
Ship a Trello ticket end to end on any web app (Vercel, Fly.io, or other host — no Shopify): pull the latest main, read the card including Figma links, implement the change in a worktree, run the project's own tests/lint/typecheck, run de-slop and code-simplifier and fold the worthwhile cleanups in, QA desktop and mobile on a local Portless preview URL, capture screenshots, open or update the GitHub PR, link the PR and Trello to each other, attach screenshots to both, comment on the card, and move it to review. Use this whenever the user points you at a Trello card or ticket for a code task and wants it delivered as a reviewable PR — phrases like 'do this Trello ticket', 'ship this card', 'pick up this ticket and open a PR', 'update the PR for this card', or names a card/list/board with a feature or bug to implement. This is the default Trello-to-PR workflow for non-Shopify projects; for Shopify theme work use shopify-trello-delivery instead.
1SKILL.mdUpdated May 30, 2026
carterdea/shopify-baseline
tools
VerifiedTrustedCommunity
Install or upgrade a quality baseline for Shopify theme repos. Use this whenever the user asks to add Shopify theme linting, Biome, Theme Check, Playwright accessibility checks, Vitest, Vite build tooling, lefthook hooks, GitHub Actions CI, Shopify Lighthouse CI, Claude Code PR review workflows, or a context-efficient run_silent.sh setup across Shopify sites.
1SKILL.mdUpdated May 25, 2026
carterdea/thermo-nuclear-code-quality-review
development
VerifiedTrustedCommunity
Run an extremely strict maintainability review for abstraction quality, giant files, and spaghetti-condition growth. Use for a thermo-nuclear code quality review, thermonuclear review, deep code quality audit, or especially harsh maintainability review.
1SKILL.mdUpdated May 23, 2026