resolve-git-conflicts
Resolve Git Conflicts
Overview
Resolve Git conflicts end-to-end in the CLI. Analyze base/ours/theirs, decide which changes to keep or combine, verify the code works, then stop for human review before any commit or continue.
Quick Start
git status -sbgit diff --name-only --diff-filter=U- For each file, inspect base/ours/theirs:
git show :1:PATH,git show :2:PATH,git show :3:PATH - Edit files to a clean, marker-free result and run
git add PATH - Run the repo build/tests if available
- Stop for review. Do not run
git commit,git merge --continue,git rebase --continue, orgit cherry-pick --continue
Workflow
- Understand why the conflict happened.
Use
git status -sbandgit log --oneline --decorate -n 20to identify the operation and the competing commits.
More from tenfyzhong/skills-hub
analyse-issue
Analyze GitHub issues by link or issue number. Use when a user says "analyse issue"/"analyze issue" or provides a GitHub issue URL/number and asks to fetch the issue content, verify it matches the current repo, and inspect local code to confirm the problem.
12create-pr
Create a Pull Request from the current branch. Syncs upstream main/master, updates current branch, handles fork remotes intelligently, and generates PR title/description from diff and commits. Respects PR templates if present. REQUIRES Must be in a git repository with gh CLI available.
11new-issue
Use when the user asks to create a GitHub issue from the current conversation context (e.g., "new issue", "create issue", "file an issue", bug/feature request) with a target repo given or auto-detected, and gh CLI is available/authenticated.
11pr-review
Comprehensive PR code review skill for git repositories. Use when reviewing a GitHub/GitLab PR by providing a PR link. Analyzes changes against merge base, explains what the PR does, provides review guidelines, identifies issues sorted by severity, evaluates test coverage, and raises uncertain questions. REQUIRES Must be in a git repository with gh CLI available.
11implement-issue
Implement a GitHub issue end-to-end. Accepts issue number or URL, syncs to latest main/master, creates a feature branch, analyzes the issue, explores the codebase thoroughly, and implements the solution. REQUIRES Must be in a git repository with gh CLI available.
11install-nvim-plugin
Install a Neovim plugin configuration from a GitHub URL. Usage '/install-nvim-plugin <github-url>'. Parses the URL, fetches plugin documentation, generates optimal lazy.nvim configuration with lazy loading, and saves to `./lua/plugins/`. Optionally updates README.md.
2