Does this skill automatically push changes to the remote repository?

No, the skill performs the synchronization and conflict resolution locally. It summarizes the changes once complete, but the final push action is left to the user for security and verification.

How does it assist with merge conflicts?

It identifies conflict files, analyzes the code intent from both branches, and helps resolve the discrepancies while ensuring the upstream structure remains intact.

Can I choose between merging and rebasing?

Yes, the skill is designed to handle both merge and rebase workflows from origin/main to fit your specific project contribution guidelines.

What happens if I have uncommitted changes?

The skill checks your current git status before starting the sync. It will prompt you to commit your work if necessary to ensure a clean state for the merge or rebase.

Sync Main

Name: Sync Main
Author: Metta-AI

byMetta-AI

•

開発者ツール

Synchronizes local git branches with origin/main by automating fetching, rebasing or merging, and conflict resolution.

The Sync Main skill streamlines the process of keeping your development branch up to date with the primary codebase. It automates the standard Git workflow of fetching the latest changes from origin/main, performing a merge or rebase, and guiding the user through conflict resolution while preserving branch intent. This skill is particularly useful for developers working in collaborative environments who need to minimize code drift and resolve integration issues efficiently before submitting their work for review.

主な機能

01Preservation of branch intent and upstream repository structure

02Pre-sync git status verification and commit reminders

03Automated fetch and merge/rebase workflow from origin/main

04Intelligent conflict detection and resolution assistance

052 GitHub stars

06Detailed post-sync summaries of all integrated changes

ユースケース

01Resolving complex merge conflicts during a rebase process

02Updating a long-running feature branch with the latest production code

03Preparing a clean branch state before opening or updating a pull request

What are Skills?·How to Install

Install with 🐟 Skill.Fish

npx skillfish add metta-ai/tribal-village sync-main

For use in Claude.ai and ChatGPT

Download Skill