Integrates a target branch into the current branch with conflict resolution and quality-gate inspection.
npx skills add https://github.com/JHostalek/dotclaude --skill merge-jhostalek
Please help me install this Agent Skill. Skill: merge Source: https://github.com/JHostalek/dotclaude/tree/main/skills/merge Command: npx skills add https://github.com/JHostalek/dotclaude --skill merge-jhostalek
This Skill helps integrate upstream branch changes into the current branch without losing work, leaving unresolved conflicts, breaking migration chains, or bypassing repository quality gates.
Use the merge skill to integrate the latest main branch into the current branch and resolve any conflicts.
High-intent search queries and answers about installing and using this skill.
To merge a remote branch safely, integrate the target branch using divergence analysis to assess ahead and behind commits, resolve conflicts using repository-specific heuristics, and validate quality gates before pushing the completed merge.
Handling git merge conflicts with modified migration files requires migration reconciliation, where the merge process detects dual modifications to the migration chain and applies conflict-specific decision making to preserve repository integrity.
Squash-merge detection works by analyzing divergence between branches to check whether the squash-merged target is already contained within the current branch, ensuring the correct merge strategy is chosen before integrating upstream changes.
Yes, you can run repository quality gates and hook validations before pushing by inspecting configured hooks and repository checks during the merge workflow, ensuring the integrated branch passes all validation criteria.
Divergence analysis is required before choosing a git merge strategy to evaluate ahead and behind commits, preventing unnecessary merges of already contained squash-merged targets and avoiding broken migration chains during branch integration.
Yes, the merge process generates a structured report detailing the integrated commits and conflict resolution outcomes, providing full visibility into the branch integration and upstream synchronization results.
jdeweedataAnalyze local git repository synchronization with remote branch tracking.
BURHANDEV-ENTERPRISEAutomate Git commit, push, and branch merging with verified user identity.
haleyrcSquash merge feature branch commits into main with a Conventional Commit message.
Knuckles-TeamAutomate Git history fixes using rebase, cherry-pick, and bisect workflows.
