Merge From Main
{{ πππ }} Merge from main
Merge From Main by majiayu000 Β· e9e982c
npx skillmds add majiayu000/merge-from-main File contents
---name: merge-from-maindescription: {{ πππ }} 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>
majiayu000/claude-skill-registry-data/tree/main/development/merge-from-main commit e9e982c4cd
Frequently asked questions
Run npx skillmds add majiayu000/merge-from-main in your terminal (requires Node.js), paste this page's agent-chat prompt into Claude, Cursor, or any MCP-connected agent, or download the SKILL.md file and copy it into your agent's skills directory.
{{ πππ }} Merge from main It is listed under Coding & Dev Tools on SkillMD.
This skill has not completed SkillMD's automated safety review yet. Capability flags: makes network calls. SkillMD never runs a skill's scripts for you; review the SKILL.md before installing.
This skill is tagged as working with Claude Code, Claude.ai, OpenAI Codex. SKILL.md is an open format, so most agents that read a skills directory can load it too.
Yes. Installing skills from SkillMD is free, and the skill stays under its author's original license.
majiayu000 (@majiayu000) published this skill. Their other Agent Skills are listed on their SkillMD profile.