Detect and resolve Git merge conflicts across single or multiple files.
npx skills add https://github.com/lucasilverentand/skills --skill merge-conflicts
Please help me install this Agent Skill. Skill: merge-conflicts Source: https://github.com/lucasilverentand/skills/tree/main/skills/git/merge-conflicts Command: npx skills add https://github.com/lucasilverentand/skills --skill merge-conflicts
Git merge conflicts are a common source of integration headaches, causing stalled work and potential errors if not resolved cleanly.
Example: merge-conflicts path/to/conflicted-file
High-intent search queries and answers about installing and using this skill.
Git merge conflicts happen when competing changes are merged into the same file. Conflict markers visually separate the versions, allowing you to manually edit the code, choose the correct lines, and finalize the integration cleanly.
The best way to identify files with Git merge conflicts is using common Git commands and shell scripts to display conflict markers. This skill automatically detects and lists the conflicting files across single or multiple files in any language.
Yes, you can use this to fix version-control conflicts across multiple files. It applies to standard development workflows during merges and rebases, handling conflict resolution across single or multiple files regardless of the programming language.
To verify a conflict resolution is correct, you should test the code and re-run the merge or rebase. This skill provides step-by-step resolution strategies and best practices to ensure the final integration is clean and error-free.
Git conflict markers show ours and theirs versions to aid decision making during integration. The ours version represents your current branch changes, while theirs represents the incoming branch changes, helping you understand and manually resolve the differences.
0xRayAIAutomate Git branching, merging, and repository synchronization workflows.
tonombResolve git merge and rebase conflicts by analyzing commit history and reconciling code changes.
sasamukuAutomatically rebase Git branches onto a target branch with conflict resolution.
AztecProtocolRebase a pull request onto its base branch and resolve conflicts with git and GitHub CLI.
