Automates bean feature branch merging into the test integration branch with reporting.
npx skills add https://github.com/beekeeper-lab/foundry --skill merge-bean
Please help me install this Agent Skill. Skill: Merge Bean Source: https://github.com/beekeeper-lab/foundry/tree/main/.claude/skills/merge-bean Command: npx skills add https://github.com/beekeeper-lab/foundry --skill merge-bean
Safely merges a bean's feature branch into the test integration branch, ensuring changes are integrated in a controlled, auditable way and outcomes are reported.
Execute the merge-bean command after a bean is verified as Done to merge its feature branch into test and report the outcome.
High-intent search queries and answers about installing and using this skill.
Automating a feature branch merge into a test integration branch requires validating branch readiness, executing a deterministic merge with --no-ff to preserve history, and pushing results to the remote while reporting the merge commit hash or conflicts.
Handling merge conflicts during feature branch integration is best managed by a merge process that makes conflicts visible during validation, reports conflict details clearly, and initiates rollbacks if needed to maintain branch stability.
A no-ff merge preserves git history by creating an explicit merge commit even when fast-forwarding is possible, ensuring the branch context is maintained within the test integration branch history.
Integrating a code review branch before its status is marked as done is not recommended, as the merge automation validates that the branch status is Done and the feature branch exists before proceeding with the integration.
An automated git merge to test fails during validation if the bean status is not marked as Done or if the feature branch does not exist, preventing unauthorized or incomplete changes from entering the test integration branch.
You do not need to manually push the merge commit after resolving git conflicts, as the automated merge process handles pushing results to the remote repository and reports the final merge commit hash during post-merge reporting.
beekeeper-labUpdate a named bean's status and owner in file and index, creating a feature branch.
takemi-ohamaMerge the latest default branch into the current working branch.
open-orthoCoordinate bean creation, status updates, and relationships in VS Code workspaces.
dsivovGuide git branch creation, commits, merges, and conflict resolution.
