merge-strategy

# Merge Strategy Configuration This skill covers sidecar's git merge and pull operations, their current implementation, known gaps, and recommended configuration patterns. ## Current Implementation ### Git Status Plugin Pull Strategies 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 | ### Workspace Plugin Merge Workflows Location: `internal/plugins/workspace/merge.go` **PR Workflow:** 1. Push branch to remote 2. Create PR via `gh pr create` 3. Wait for PR merge (polling) 4. Cleanup: delete worktree, branches, pull base **Direct Merge (No PR)** at `merge.go:430-498`: ``` 1. git fetch origin <baseBranch> 2. git checkout <baseBranch> 3. git pull origin <baseBranch> 4. git merge <branch> --no-ff -m "Merge branch '<branch>'" // Hardcoded --no-ff 5. git push origin <baseBranch> ``` **Post-Merge Pull** at `merge.go:500-551`: - When on base branch: `git pull --ff-only origin <branch>` (hardcoded) - Otherwise: `git fetch` + `git update-ref` ...