Exécutez n'importe quel Skill dans Manus
en un clic

Exécutez n'importe quel Skill dans Manus en un clic

merge-main

Étoiles245

Forks5

Mis à jour31 janvier 2026 à 15:43

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

Installation

Installer avec Codex ou Claude Copiez ce prompt, collez-le dans Codex, Claude ou un autre assistant, puis laissez-le vérifier la page du skill et l'installer pour vous.

Exécuter dans Manus

Source

ryoppippi

ryoppippi/dotfiles

Ouvrir le dépôt GitHub Voir les dépôts du créateur

Téléchargement

Exécuter dans Manus

Métiers associésSOC

Basé sur la classification professionnelle SOC

Développeurs de logicielsProfessions informatiques et mathématiques·SOC 15-1252

SKILL.md

readonly

name	merge-main
description	Merge the latest main branch into your current feature branch. Use when you need to sync your branch with upstream changes.

You are a git merge specialist.

Current branch: !git branch --show-current **Upstream:** `!`git rev-parse --abbrev-ref --symbolic-full-name @{u} 2>/dev/null || echo "No upstream configured" Behind/ahead of origin/main: !git rev-list --left-right --count origin/main...HEAD 2>/dev/null || echo "Unable to compare"``

Workflow

Check the branch info above: If on main, switch to your feature branch first
Fetch Remote: Run git fetch origin (or git fetch upstream if applicable)
Merge Main: Run git merge origin/main (or appropriate remote/branch)
Resolve Conflicts: If merge conflicts occur, resolve them carefully
Test: Ensure the code still works after the merge
Commit: Commit the merge if necessary
Push: Push the updated branch to remote

Handle merge conflicts carefully and explain any resolution decisions made.

Plus depuis ce dépôt

même dépôt

codex-review

ryoppippi/dotfiles

Run a code review using Codex CLI. Use when the user wants a code review of uncommitted changes, a specific commit, or changes against a base branch.

2026-06-24245

tdd

ryoppippi/dotfiles

Guides execute-inspect-adjust development and t-wada Red-Green-Refactor TDD. Use for exploratory implementation or when stable behaviour needs an executable test-first contract.

2026-06-24245

nix-github-rate-limit

ryoppippi/dotfiles

Prevents and handles GitHub API rate limits with gh-nix. Use when Nix, flakes, nixpkgs commands, or comma may fetch GitHub-backed inputs.

2026-06-21245

git-wt

ryoppippi/dotfiles

Manages worktree lifecycle operations through git-wt without replacing an existing linked worktree. Use when creating, switching, listing, renaming, or deleting worktrees.

2026-06-20245

create-pr

ryoppippi/dotfiles

Runs the full PR workflow — creates a feature branch, commits, pushes, and opens the pull request. Use when the user asks to create or open a PR ("create a PR", "push this up and open a PR").

2026-06-19245

missing-tools

ryoppippi/dotfiles

Resolves missing CLI tools. Use when a command is unavailable, a shell reports command not found, or a tool must be run without installing it globally.

2026-06-19245

name	merge-main
description	Merge the latest main branch into your current feature branch. Use when you need to sync your branch with upstream changes.

You are a git merge specialist.

Workflow

Check the branch info above: If on main, switch to your feature branch first
Fetch Remote: Run git fetch origin (or git fetch upstream if applicable)
Merge Main: Run git merge origin/main (or appropriate remote/branch)
Resolve Conflicts: If merge conflicts occur, resolve them carefully
Test: Ensure the code still works after the merge
Commit: Commit the merge if necessary
Push: Push the updated branch to remote

Handle merge conflicts carefully and explain any resolution decisions made.