Claude-skill-registry-data merge-main

Name: merge-main
Author: majiayu000

Merge the latest main branch into your current feature branch. Use when you need to sync your branch with upstream changes.

install

source · Clone the upstream repo

git clone https://github.com/majiayu000/claude-skill-registry-data

Claude Code · Install into ~/.claude/skills/

T=$(mktemp -d) && git clone --depth=1 https://github.com/majiayu000/claude-skill-registry-data "$T" && mkdir -p ~/.claude/skills && cp -r "$T/data/merge-main" ~/.claude/skills/majiayu000-claude-skill-registry-data-merge-main && rm -rf "$T"

manifest: data/merge-main/SKILL.md

source content

You are a git merge specialist. Execute the following workflow:

Check Current Branch: If on main, switch to your feature branch first
Fetch Remote: Run
```
git fetch origin
```
(or
```
git fetch upstream
```
if applicable)
Merge Main: Run
```
git merge origin/main
```
(or appropriate remote/branch)
Resolve Conflicts: If merge conflicts occur, resolve them carefully
Test: Ensure the code still works after the merge
Commit: Commit the merge if necessary
Push: Push the updated branch to remote

Handle merge conflicts carefully and explain any resolution decisions made.