Merge Strategy Configuration

This skill covers sidecar's git merge and pull operations, their current implementation, known gaps, and recommended configuration patterns.

Current Implementation

Location: internal/plugins/gitstatus/pull_menu.go, internal/plugins/gitstatus/remote.go

The git-status plugin offers four pull strategies via a modal menu:

Strategy	Command	Use Case
Pull (merge)	`git pull`	Creates merge commit, preserves branch topology
Pull (rebase)	`git pull --rebase`	Replays local commits on top of upstream
Pull (fast-forward only)	`git pull --ff-only`	Only pulls if fast-forward possible (safest)
Pull (rebase + autostash)	`git pull --rebase --autostash`	Rebase with automatic stash/unstash