repo-sync

Cherry-pick commits from legacy repositories into the hawk monorepo and port Terraform changes to Pulumi.

49|33|Updated Mar 23, 2026
One-click install
npx skills add https://github.com/METR/hawk --skill repo-sync
Or copy as Structured Prompt for Agent
Please help me install this Agent Skill.
Skill: repo-sync
Source: https://github.com/METR/hawk/tree/main/.claude/skills/repo-sync
Command: npx skills add https://github.com/METR/hawk --skill repo-sync

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

This Skill helps teams sync the platform monorepo with four legacy repositories by cherry-picking new commits, porting Terraform changes to Pulumi, and updating the sync history, ensuring changes are consolidated consistently.

Core Features & Use Cases

  • Cherry-pick new commits from the four remotes into hawk/monorepo using subtree cherry-pick and format-patch workflows as needed.
  • Resolve conflicts and port infrastructure changes from legacy repos into Pulumi, while maintaining a documented sync history.
  • Provide a phase-based workflow (Prepare, Find last synced commits, Cherry-pick, Resolve conflicts, Create PR, Port Pulumi, Update sync history) and guardrails for IAM and path rewrites.

Quick Start

Clone the hawk repository, configure remotes, and follow the phase-based workflow to cherry-pick changes from the legacy repositories into the monorepo.

Frequently Asked Questions about repo-sync

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

FAQPage Schema
How do I sync a monorepo with multiple legacy repositories?

To sync a monorepo with multiple legacy repositories, you can cherry-pick new commits from remote repositories, resolve conflicts, and update the sync history to ensure changes are consolidated consistently.

What is the best way to port Terraform changes to Pulumi during a repository sync?

Porting Terraform changes to Pulumi during a repository sync involves a phase-based workflow that cherry-picks updates, resolves conflicts, and applies guardrails for IAM and path rewrites to maintain infrastructure consistency.

How do I cherry-pick commits from multiple remotes into a monorepo?

Cherry-picking commits from multiple remotes into a monorepo uses subtree cherry-pick and format-patch workflows to translate renamed paths, resolve conflicts, and document the sync history accurately.

Can I use a phase-based workflow to manage repository sync conflicts?

Yes, a phase-based workflow manages repository sync conflicts by guiding you through preparation, finding last synced commits, cherry-picking, resolving conflicts, creating pull requests, porting Pulumi, and updating sync history.

How do I handle path rewrites when syncing legacy repositories into a monorepo?

Handling path rewrites when syncing legacy repositories into a monorepo utilizes format-patch translation to correctly map renamed paths and ensure changes integrate smoothly into the target monorepo structure.

Why do I need to maintain a documented sync history when consolidating repositories?

Maintaining a documented sync history when consolidating repositories tracks which commits have been cherry-picked from legacy remotes, preventing duplicate merges and ensuring consistent infrastructure porting to Pulumi.