# Merge Main

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

- Skill: `majiayu000/merge-main` (Agent Skill, multi-file: 2 files)
- Install (CLI): `npx skillmds add majiayu000/merge-main`
- Raw SKILL.md: https://api.skillmd.com/api/skills/majiayu000/merge-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-main

---


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

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

Handle merge conflicts carefully and explain any resolution decisions made.