aigeniusinstitute/mattpocock-skills

resolving-merge-conflicts

Use when you need to resolve an in-progress git merge/rebase conflict.

Quelltext ansehen

Verwendung

  1. Installationsbefehl kopieren und das Quellpaket vor der Installation in der eigenen Agentenumgebung prüfen.
  2. Benötigte Werkzeuge, Zugangsdaten und Hosts im Original prüfen.
  3. Eingabe und gewünschtes Ergebnis beschreiben und die Ausgabe mit den Quellen abgleichen.
npx skills add https://github.com/aigeniusinstitute/mattpocock-skills --skill resolving-merge-conflicts

Vor dem Start

  • Die Installation umfasst weder Modellabo noch API-Kontingent oder Dateizugriffsrechte.
  • Sterne und Installationen zeigen Aktivität, keine unabhängige Qualitäts- oder Sicherheitsprüfung.
Originales Skill-Dokument

Aus dem Quell-Repository gerendert; Überschriften, Beispiele, Code, Tabellen, Links und Bilder bleiben erhalten.

  1. See the current state of the merge/rebase. Check git history, and the conflicting files.
  1. Find the primary sources for each conflict. Understand deeply why each change was made, and what the original intent was. Read the commit messages, check the PRs, check original issues/tickets.
  1. Resolve each hunk. Preserve both intents where possible. Where incompatible, pick the one matching the merge's stated goal and note the trade-off. Do not invent new behaviour. Always resolve; never --abort.
  1. Discover the project's automated checks and run them — typically typecheck, then tests, then format. Fix anything the merge broke.
  1. Finish the merge/rebase. Stage everything and commit. If rebasing, continue the rebase process until all commits are rebased.
aus demselben Repository

Weitere Skills

Alle Skills
aigeniusinstitute
Community

batch-grill-me

A relentless interview that asks every frontier question at once, round by round.

Installationen / 1h
1
GitHub Stars
3
Aktualisiert
17. Juli
aigeniusinstitute
Community

code-review

Review the changes since a fixed point (commit, branch, tag, or merge-base) along two axes — Standards (does the code follow this repo's documented coding standards?) and Spec (does the code match what the originating issue/PRD asked for?). Runs both reviews in parallel sub-agents and reports them side by side. Use when the user wants to review a branch, a PR, work-in-progress changes, or asks to "review since X".

Installationen / 1h
1
GitHub Stars
3
Aktualisiert
17. Juli
aigeniusinstitute
Community

design-an-interface

Generate multiple radically different interface designs for a module using parallel sub-agents. Use when user wants to design an API, explore interface options, compare module shapes, or mentions "design it twice".

Installationen / 1h
1
GitHub Stars
3
Aktualisiert
17. Juli
aigeniusinstitute
Community

domain-modeling

Build and sharpen a project's domain model. Use when the user wants to pin down domain terminology or a ubiquitous language, record an architectural decision, or when another skill needs to maintain the domain model.

Installationen / 1h
1
GitHub Stars
3
Aktualisiert
17. Juli