Search Results: merge-conflicts

Found 3 Skills

git-advanced-merging

Use when resolving non-trivial merge conflicts, choosing a merge strategy, or undoing a merge — covers -X options, diff3 markers, strategy vs option, reset vs revert -m, and re-merging reverted branches

🇺🇸|EnglishTranslated

Version Controlmcollina/skills

octocat

Git and GitHub wizard using gh CLI for all git operations and GitHub interactions

🇺🇸|EnglishTranslated

Version Controlaksuharun/skills

git-best-practices

Git best practices for commit messages and branch workflow. Use when: - Writing, reviewing, or advising on a git commit message - Advising on branching strategy, merging, or rebasing - Setting up or explaining a team Git workflow - Preparing or reviewing a pull request - Resolving or advising how to avoid merge conflicts - Any task involving git history, linear history, or PR hygiene

🇺🇸|EnglishTranslated