Resolving Merge Conflicts

Opens the skill on GitHub

Source Matt Pocock

Installnpx skills add mattpocock/skills --skill resolving-merge-conflicts

Overview

Resolves in-progress Git merge and rebase conflicts through a clear sequence of file and history checks.

AWS AMI BuilderBuilds Amazon Machine Images with Packer's amazon-ebs builder.Coding agentInfraOps
Caveman CommitWrites Conventional Commit messages reduced to their essential intent.Coding agentGitMeta
EAS UpdateConfigures EAS Update for over-the-air JavaScript and asset releases with expo-updates.Coding agentMobileOps
gcloudValidates gcloud CLI operations and constructs commands with Google Cloud safety checks.Coding agentInfraOps
Git Guardrails for Claude CodeAdds Claude Code hooks that block dangerous Git commands before execution.Coding agentSecurityGit
Hugging Face CLIOperates the Hugging Face Hub CLI for downloads, uploads, repositories, papers, jobs, and Spaces.Coding agentDataOps