Jeden Skill in Manus ausführen
mit einem Klick

Jeden Skill in Manus mit einem Klick ausführen

Loslegen

rebase

Sterne132

Forks9

Aktualisiert23. März 2026 um 15:42

Rebases the current branch onto the latest main branch.

Installation

Mit Codex oder Claude installieren Kopieren Sie diesen Prompt, fügen Sie ihn in Codex, Claude oder einen anderen Assistant ein und lassen Sie die Skill-Seite prüfen und installieren.

In Manus ausführen

Quelle

mikotoIO

mikotoIO/mikoto

GitHub-Repository öffnen Creator-Repositorys ansehen

Download

In Manus ausführen

Verwandte BerufeSOC

Basierend auf der SOC-Berufsklassifikation

SoftwareentwicklerInformatik- und Mathematikberufe·SOC 15-1252

SKILL.md

readonly

name	rebase
description	Rebases the current branch onto the latest main branch.

Steps:

Fetch the latest changes from origin.
Rebase the current branch onto origin/main.
If there are conflicts, resolve conflicts automatically, trying to preserve features from both branches.

Conflict resolution

If no conflicts: Report success — how many commits were replayed, new HEAD.

If conflicts occur, handle each one:

Run git diff --name-only --diff-filter=U to list conflicted files.
For each conflicted file, read the file and examine the conflict markers.
Attempt trivial resolution: if one side is clearly a superset (the other side made no changes in that region), resolve automatically.
For genuine conflicts, show the user both sides with surrounding context using AskUserQuestion. Offer:
- Keep ours — accept the current branch's version
- Keep theirs — accept the upstream version
- Abort rebase — run git rebase --abort and stop
After resolving all files in the current step: git add <files> and git rebase --continue.
Repeat until the rebase completes or the user aborts.

Mehr aus diesem Repository

gleiches Repository

chakra-ui

mikotoIO/mikoto

Contains Chakra UI v3 documentation for styling, theming, and components. ALWAYS activate when code imports from `@chakra-ui/react`, or when the user asks about Chakra UI components, styling, or theming.

2026-04-23132

typescript-react

mikotoIO/mikoto

Contains TypeScript/React patterns and conventions for the Mikoto frontend. ALWAYS activate before working on frontend code in apps/client/ or packages/.

2026-04-23132

create-pr

mikotoIO/mikoto

Creates a pull request using the GitHub CLI.

2026-03-23132

rust

mikotoIO/mikoto

Contains knowledge on Mikoto usage of Rust. ALWAYS activate before interacting with the backend, or any part of the codebase written in Rust.

2026-03-07132

learn

mikotoIO/mikoto

Creates a new skill or updates an existing skill to capture new knowledge. Use when you want Claude to remember patterns, workflows, or project-specific guidance.

2026-02-12132

commit

mikotoIO/mikoto

Commits the code with a concise summary of the change.

2026-01-25132

name	rebase
description	Rebases the current branch onto the latest main branch.

Steps:

Fetch the latest changes from origin.
Rebase the current branch onto origin/main.
If there are conflicts, resolve conflicts automatically, trying to preserve features from both branches.

Conflict resolution

If no conflicts: Report success — how many commits were replayed, new HEAD.

If conflicts occur, handle each one:

Run git diff --name-only --diff-filter=U to list conflicted files.
For each conflicted file, read the file and examine the conflict markers.
Attempt trivial resolution: if one side is clearly a superset (the other side made no changes in that region), resolve automatically.
For genuine conflicts, show the user both sides with surrounding context using AskUserQuestion. Offer:
- Keep ours — accept the current branch's version
- Keep theirs — accept the upstream version
- Abort rebase — run git rebase --abort and stop
After resolving all files in the current step: git add <files> and git rebase --continue.
Repeat until the rebase completes or the user aborts.