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
• Conflict handling: resolve merge conflicts autonomously unless the user explicitly wants to review them first or the repository context is insufficient to choose a safe resolution

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

Workflow

1. Resolve branch names