Merge Branch Into Current

Scope

Use this skill inside a Git repository when the goal is to merge one branch into the current branch and keep an explicit merge commit.

Default behavior:

• Target branch: the current branch
• Source branch: the branch explicitly provided by the user
• Merge strategy: git merge --no-ff
• Dirty-check scope: the current worktree plus any active worktree that is currently checked out on the source or target branch

Do not use squash merge or rebase unless the user explicitly overrides the request.

Workflow

1. Resolve branch names