# Merge From Main

> {{ 𝛀𝛀𝛀 }} Merge from main

- Skill: `majiayu000/merge-from-main` (Agent Skill, multi-file: 2 files)
- Install (CLI): `npx skillmds add majiayu000/merge-from-main`
- Raw SKILL.md: https://api.skillmd.com/api/skills/majiayu000/merge-from-main/raw
- Safety review: pending
- Works with: Claude Code, Claude.ai, OpenAI Codex
- Category: Coding & Dev Tools
- Author: majiayu000 (https://skillmd.com/u/majiayu000)
- Updated: 2026-09-09
- Page: https://skillmd.com/skills/majiayu000/merge-from-main

---


<task name="Merge Main into Current Branch">
    <user-guidance>$ARGUMENTS</user-guidance>
    <steps>
        1. Check current branch name and confirm with user
        2. Do NOT create a worktree - work in the current directory
        3. Run `git fetch origin main && git merge origin/main`
        4. If conflicts exist, list them and resolve preserving our branch's intent.
        5. Run tests to verify
        6. Push with `git push`
    </steps>
</task>