merge-strategy

To configure a git merge strategy, set a default option such as no-ff, ff, ff-only, squash, or rebase within your project schema. This approach applies the chosen merge strategy consistently across pull requests and direct-merge workflows.

Git merge strategies differ in commit history management: fast-forward keeps a linear history, squash combines commits into one, and rebase rewrites branch history. This Skill applies these git merge strategies with configurable defaults and protected-branch safety checks.

Handling git merge conflicts in a pull request workflow involves applying reconciliation patterns and merge commit templates. This Skill provides guidance on resolving conflicts and performing post-merge cleanup across PR-based and direct-merge scenarios.

Yes, you can enforce protected branch warnings when merging git branches. The Skill includes safety checks for protected branches and configurable merge commit templates to prevent accidental direct merges to critical branches.

Yes, Sidecar Git Status supports squash and rebase merge workflows. Developers using Sidecar's Git Status and Workspace plugins can apply merge, rebase, fast-forward, and squash workflows across PR and direct-merge scenarios.

The best way to manage branch cleanup after a git merge is using post-merge cleanup patterns within a unified workflow. This Skill coordinates merge strategies and provides guidance on reconciliation and cleanup for PR-based and direct-merge scenarios.