Merge

Merges a branch into current branch with conflict resolution. Use when user wants to merge, combine branches, or integrate changes.

majiayu000 Updated 567 repo stars

File contents

Merge

Merge branch: $ARGUMENTS (default: origin main) into current branch.

Task

Merge the specified branch into the current branch. Resolve conflicts if any occur.

git merge $ARGUMENTS
# or default:
git merge origin main

If conflicts occur, analyze and resolve them, then complete the merge.

majiayu000/claude-skill-registry-data/tree/main/devops/merge-sasamuku-dotfiles-2 commit 9a881cfb6b

Frequently asked questions

npx skillmds@latest add majiayu000/merge-10