worktree-commit-merge

Overview

You're in a git worktree on a feature branch with uncommitted changes. This skill:

1. Commits those changes to the current branch
2. Merges the branch into master/main — fast-forward if possible, otherwise a regular merge commit

Step 1: Gather context

Run these in parallel:

git status
git diff HEAD
git branch --show-current
git worktree list
git log --oneline -10