git-workflowsdevops
merge-strategy
Git merge strategies, conflict resolution approaches, merge vs rebase recommendations, and branch integration patterns in sidecar. Covers pull strategy menu, direct merge workflow, squash merge, commit message templates, configurable defaults, and protected branches. Use when working on git merge features or making decisions about merge strategies.
maintainer
marcus
更新於 2/7/2026
星標
936
分支
70
quick start
Installation and usage
Git merge strategies, conflict resolution approaches, merge vs rebase recommendations, and branch integration patterns in sidecar. Covers pull strategy menu, direct merge workflow, squash merge, commit message templates, configurable defaults, and protected branches. Use when working on git merge features or making decisions about merge strategies.
安裝
$ install --globalskills.sh
使用
安裝後，您可以通過在終端運行以下命令來使用此技能：
skills use merge-strategy