Fetch and merge the base branch into the current feature branch.
npx skills add https://github.com/cboone/cboone-cc-plugins --skill merge-main
Please help me install this Agent Skill. Skill: merge-main Source: https://github.com/cboone/cboone-cc-plugins/tree/main/plugins/merge-main/skills/merge-main Command: npx skills add https://github.com/cboone/cboone-cc-plugins --skill merge-main
This Skill streamlines the process of updating your current feature branch with the latest changes from the main or base branch, automatically handling potential merge conflicts.
main to avoid a large, complex merge later. This Skill handles that update smoothly.Update the current branch by merging the base branch.
High-intent search queries and answers about installing and using this skill.
To merge the main branch, this skill fetches the latest base branch changes and integrates them into your current feature branch. It automatically detects the base branch via the gh CLI or fallback methods, then pushes the merged result.
Before a git branch merge, uncommitted changes are handled by automatically stashing them or invoking a commit workflow. This ensures a clean working tree before fetching and merging the base branch updates.
Conflict resolution during a base branch merge provides a structured workflow to guide you through resolving clashes. You can choose to stash, commit, or abort the merge if the conflicts cannot be resolved automatically.
Yes, the merge workflow supports automatic base branch detection without manual configuration. It identifies the base branch using the gh command line tool and utilizes fallback methods if gh is unavailable.
After a git merge is completed, the workflow includes post-merge steps for lockfile updates. It ensures dependencies are synchronized before pushing the final merged feature branch to the remote repository.
tamago0224Analyze git status and diff to create Git Flow branches automatically.
Soul-Brews-StudioSwitch to main, pull latest changes, and delete merged branches.
LarryHsiaoSwitch Git branches safely by stashing or temporarily committing uncommitted changes.
dhntReplay feature branch commits onto an updated base with conflict resolution.