How do I install the Worktree Commit Merge skill?

Run npx skillmds@latest add waldencui/worktree-commit-merge in your terminal (requires Node.js), paste this page's agent-chat prompt into Claude, Cursor, or any MCP-connected agent, or download the SKILL.md file and copy it into your agent's skills directory.

Is Worktree Commit Merge safe to use?

This skill has not completed SkillMD's automated safety review yet. SkillMD never runs a skill's scripts for you; review the SKILL.md before installing.

Which AI agents work with Worktree Commit Merge?

This skill is tagged as working with Claude Code, Claude.ai, OpenAI Codex. SKILL.md is an open format, so most agents that read a skills directory can load it too.

Is Worktree Commit Merge free to use?

Yes. Installing skills from SkillMD is free, and the skill stays under its author's original license.

Who published Worktree Commit Merge?

waldencui (@waldencui) published this skill. Their other Agent Skills are listed on their SkillMD profile.

Worktree Commit Merge by waldencui — Agent Skill

Name: Worktree Commit Merge
Author: waldencui

Worktree Commit Merge

Commit worktree changes, merge into master/main, then sync the worktree branch with master. Trigger when the user says things like "commit and merge to master", "we're done with this worktree, commit and merge", or any similar phrasing. Don't wait for the user to spell out "worktree" — if there are changes and they mention merging to master/main, use this skill.

waldencui 6f552da 2 files · 5.6 KB Updated Sep 17, 2026

File contents

Overview

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

Commits those changes to the current branch
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

This gives you:

What files changed and what's staged vs unstaged
The current branch name (the worktree branch)
The main worktree path and which branch it has checked out
Recent commit style so your message fits the project

Step 2: Commit the changes

Stage specific files rather than git add -A, which can accidentally include unintended files like .env or build artifacts:

git add <specific relevant files>

Write a commit message that follows the style from the recent log. Always pass via heredoc to preserve formatting:

git commit -m "$(cat <<'EOF'
<type>(<scope>): <description>

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
EOF
)"

Step 3: Identify the merge target

From git worktree list output, the first entry is always the main worktree. Identify:

MAIN_PATH — filesystem path of the main worktree
MAIN_BRANCH — branch checked out there (typically master or main)
CURRENT_BRANCH — the branch you just committed to

Step 4: Merge into master/main

Try fast-forward first. If the histories have diverged, fall back to a regular merge commit:

git -C <MAIN_PATH> merge --ff-only <CURRENT_BRANCH> \
  || git -C <MAIN_PATH> merge <CURRENT_BRANCH> --no-edit

Tell the user which path was taken — fast-forward or merge commit — so they know what happened to the history.

Step 5: Sync the worktree branch with master/main

After merging, bring the worktree branch up-to-date so it includes any commits that were already on master/main (e.g., from other merges):

git merge <MAIN_BRANCH>

This runs in the worktree directory (current directory), pulling in the full state of master/main.

Step 6: Confirm

git -C <MAIN_PATH> log --oneline -5

Report what was committed (files + message), how it was merged, and that the worktree branch is now in sync with master/main.

---name: worktree-commit-mergedescription: Commit worktree changes, merge into master/main, then sync the worktree branch with master. Trigger when the user says things like "commit and merge to master", "we're done with this worktree, commit and merge", or any similar phrasing. Don't wait for the user to spell out "worktree" — if there are changes and they mention merging to master/main, use this skill.---## OverviewYou're in a git worktree on a feature branch with uncommitted changes. This skill:1. Commits those changes to the current branch2. Merges the branch into master/main — fast-forward if possible, otherwise a regular merge commit## Step 1: Gather contextRun these in parallel:```bashgit statusgit diff HEADgit branch --show-currentgit worktree listgit log --oneline -10```This gives you:- What files changed and what's staged vs unstaged- The current branch name (the worktree branch)- The main worktree path and which branch it has checked out- Recent commit style so your message fits the project## Step 2: Commit the changesStage specific files rather than `git add -A`, which can accidentally include unintended files like `.env` or build artifacts:```bashgit add <specific relevant files>```Write a commit message that follows the style from the recent log. Always pass via heredoc to preserve formatting:```bashgit commit -m "$(cat <<'EOF'<type>(<scope>): <description>Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>EOF)"```## Step 3: Identify the merge targetFrom `git worktree list` output, the **first entry is always the main worktree**. Identify:- `MAIN_PATH` — filesystem path of the main worktree- `MAIN_BRANCH` — branch checked out there (typically `master` or `main`)- `CURRENT_BRANCH` — the branch you just committed to## Step 4: Merge into master/mainTry fast-forward first. If the histories have diverged, fall back to a regular merge commit:```bashgit -C <MAIN_PATH> merge --ff-only <CURRENT_BRANCH> \ || git -C <MAIN_PATH> merge <CURRENT_BRANCH> --no-edit```Tell the user which path was taken — fast-forward or merge commit — so they know what happened to the history.## Step 5: Sync the worktree branch with master/mainAfter merging, bring the worktree branch up-to-date so it includes any commits that were already on master/main (e.g., from other merges):```bashgit merge <MAIN_BRANCH>```This runs in the worktree directory (current directory), pulling in the full state of master/main.## Step 6: Confirm```bashgit -C <MAIN_PATH> log --oneline -5```Report what was committed (files + message), how it was merged, and that the worktree branch is now in sync with master/main.

Frequently asked questions