GitButler Complete Branch

Safely merge virtual branches by creating a safety snapshot first, then following GitButler's guided workflow for direct merges or pull requests. The Skill automates prerequisite validation, applies --no-ff merges to preserve history, and handles post-merge cleanup automatically.

Merge conflicts trigger GitButler's error recovery workflow, which provides clear solutions and guides you through resolution. The safety snapshot created beforehand allows easy recovery if integration fails.

Yes, the Skill supports stacked branches in its merge orchestration logic. It validates prerequisites across the stack, executes merges in sequence, and manages cleanup for dependent branches after integration into main.

Post-merge cleanup is automated as part of the Skill's workflow after successful integration. Virtual branches are removed following the --no-ff merge, and the workspace is reset to reflect main's updated state.

The Skill accommodates PR-based integration workflows as an alternative to direct merges. It handles push operations, PR metadata, and cleanup procedures while maintaining the same safety snapshot and prerequisite validation steps.

Yes, the Skill requires tests to pass as a prerequisite before branch completion. Prerequisites validation ensures all checks succeed, reviews are approved, and the workspace is ready before merge orchestration begins.