sync-main

Merge the latest default branch into the current working branch.

Updated Jan 30, 2026

Search Tags:#git #workflow #merge #branch #conflict-resolution #default-branch

Ready to run

npx skills add https://github.com/takemi-ohama/ai-plugins --skill sync-main-takemi-ohama

💬 Prompt for ChatGPT / Claude Chat▼

Please help me install this Agent Skill.
Skill: sync-main
Source: https://github.com/takemi-ohama/ai-plugins/tree/main/plugins/ndf/skills/sync-main
Command: npx skills add https://github.com/takemi-ohama/ai-plugins --skill sync-main-takemi-ohama

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

最新のデフォルトブランチ(main/master)を現在のブランチにマージするワークフロー。feature branchをmainに追従させる際に使用。

Core Features & Use Cases

最新のデフォルトブランチを現在のブランチにマージします。
未コミットの変更がある場合は stash して安全に作業を続けます。
コンフリクトが発生した場合は自動解決は行わず、ユーザーに解決を求めます。
マージ後は変更をリモートへ反映するための後処理をサポートします。

Quick Start

Run the main sync workflow to bring your current branch up to date with the default branch.

Frequently Asked Questions about sync-main

High-intent search queries and answers about installing and using this skill.

FAQPage Schema

How do I merge the latest main branch into my current feature branch?▼

To merge the latest main branch into your current feature branch, you run a sync workflow that fetches the default branch and merges it into your working branch. It applies git merge --no-edit to keep your feature branch up to date.

What happens to uncommitted changes when syncing a feature branch with main?▼

When syncing a feature branch with main, uncommitted changes are safely stashed before the merge begins. The workflow handles stash management automatically, applying your stashed changes back after the default branch merge completes.

Does this git merge workflow automatically resolve merge conflicts?▼

No, this git merge workflow does not automatically resolve merge conflicts. When conflicts occur during the default branch merge, the process stops and reports them, requiring you to manually resolve the conflicts before continuing.

Can I push my feature branch to remote after merging the default branch?▼

Yes, you can push your feature branch to remote after merging the default branch. The sync workflow supports post-merge processing to push the updated changes to the remote repository, ensuring your branch reflects the latest state.

What is the best way to keep a feature branch synced with the default branch in collaborative projects?▼

The best way to keep a feature branch synced with the default branch in collaborative projects is to use a dedicated merge workflow. It fetches the latest default branch, merges it into your current branch, and handles stashing to keep your local changes safe.