3.1 Workspace Merge — Git skill for Claude Code
Merge workspace-branch til feature uten å fjerne worktreen.
How to install 3.1 Workspace Merge
Installs to ~/.claude/commands/sultanavtajev-claude-next.js-template-3.1-workspace-merge.md
mkdir -p ~/.claude/commands && curl -fsSL https://raw.githubusercontent.com/sultanavtajev/claude-next.js-template/HEAD/.claude/commands/3.1-workspace-merge.md -o ~/.claude/commands/sultanavtajev-claude-next.js-template-3.1-workspace-merge.md Restart Claude Code, or start a new session, for it to be picked up.
What 3.1 Workspace Merge does
description: Merge workspace-branch til feature uten å fjerne worktreen. argument-hint:
Merge workspace "$ARGUMENTS" til feature uten å fjerne worktreen. Gjør følgende steg sekvensielt:
- Sjekk at alle endringer er committet i workspace-branchen
- Merge workspace-branchen til feature
- Bekreft merge, worktree beholdes
0. Etabler dynamiske stier
- Worktree:
$(dirname "$CLAUDE_PROJECT_DIR")/$(basename "$CLAUDE_PROJECT_DIR")-worktrees/$ARGUMENTS
1. Sjekk u
Alternatives in Git
- Maestro Merge — Merge session worktree branch back to main 530 ★
- Finalize Feature — Finalize the feature "$ARGUMENTS" — create branch, commit, and open PR 180 ★
- Hybrid Complete — Complete Hybrid Ralph task in worktree, verify all stories complete, commit code changes (excluding planning f 123 ★
Full documentation available on GitHub
View Source RepositoryRelated Skills
3.4 Workspace Finish
Avslutt workspace — commit-sjekk, merge til feature, rydd opp worktree og branch.
3.3 Workspace Discard
Forkast workspace uten merge — sletter worktree og branch.
Merge
Merge a feature branch into current branch
Cdd Merge Base
Integrate the current state of the base branch into the feature branch. Two phases: a dry-run conflict assessm
PR Merged
Post-merge cleanup — checkout main, pull latest, delete the feature branch, and close the linked work item.
Update Branch
Merge main into the current feature branch
Related Agents
Develop
Implements a fix or feature for a single GitHub issue in an isolated worktree. Iterates up to 3 cycles (merge
Gitnexus Branch Hygiene Reviewer
GitNexus branch hygiene and mergeability reviewer. Use to classify merge state, conflicts, stale branches, mer
Genblaze Maintainer
The Genblaze Maintainer — autonomous guardian of the Genblaze repo. Resolves GitHub issues end-to-end (branch