Merge or cherry-pick Git worktree branch changes into the repository root.
npx skills add https://github.com/ongspxm/mobot_skills --skill merge-worktree-ongspxm
Please help me install this Agent Skill. Skill: merge-worktree Source: https://github.com/ongspxm/mobot_skills/tree/main/merge-worktree Command: npx skills add https://github.com/ongspxm/mobot_skills --skill merge-worktree-ongspxm
This Skill streamlines the process of merging changes from a Git worktree back into the main repository, ensuring a clean and controlled integration.
apply_patch.Execute the merge-worktree skill to integrate your current worktree changes into the repository root.
High-intent search queries and answers about installing and using this skill.
Merging Git worktree changes involves integrating or cherry-picking commits from a worktree branch back into the repository root's default branch. This process uses Git commands for worktree operations, diffing, and merging to ensure clean code integration.
Resolving Git merge conflicts during worktree integration requires line-by-line conflict resolution. You can use the apply_patch tool to manually adjust conflicting code segments and successfully merge the worktree changes into the default branch.
The best way to integrate a feature branch from a separate worktree is using a guided workflow that renders and executes controlled merge or cherry-pick operations. This streamlines the process and prevents manual Git command errors during code integration.
Yes, you can cherry-pick specific changes from a Git worktree branch into the repository root. This allows you to selectively integrate individual commits rather than merging the entire worktree branch history into the default branch.
You need to integrate a Git worktree branch when you have finished developing a feature in a separate worktree and want to bring those changes back into your main development branch. This ensures controlled merging and a clean repository history.
Doyajin174Create isolated Git worktrees for parallel feature development.
haryelramalhoDelete stale local git branches removed from the remote.
cryborg1211Merge a git worktree branch into the main checkout and prune it.
pkuppensClean up merged branches, worktrees, GitHub Actions runs, and tmp directories.