fix-sync

Resolve merge conflicts between public ClickHouse PRs and private sync branches.

Updated Mar 10, 2026

Search Tags:#automation #git #workflow #pull-request #merge-conflicts #upstream #private-repo

Ready to run

npx skills add https://github.com/tusharg1993/ClickHouse --skill fix-sync-tusharg1993

💬 Prompt for ChatGPT / Claude Chat▼

Please help me install this Agent Skill.
Skill: fix-sync
Source: https://github.com/tusharg1993/ClickHouse/tree/main/.claude/skills/fix-sync
Command: npx skills add https://github.com/tusharg1993/ClickHouse --skill fix-sync-tusharg1993

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

Automatically resolves merge conflicts between a public ClickHouse PR and its corresponding private sync PR, reducing manual intervention in PR workflows.

Core Features & Use Cases

Parse the PR number or URL from user input.
Locate the private 'clickhouse-private' repository and switch to the private sync branch.
Merge upstream changes into the private sync branch and resolve conflicts.
Push the resolved branch back to the private repo and verify the PR status.

Quick Start

Provide the public PR number or full PR URL to start resolving the corresponding private sync PR.

Frequently Asked Questions about fix-sync

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

FAQPage Schema

How do I resolve merge conflicts in a private repo sync PR from an upstream public branch?▼

To resolve merge conflicts in a private repo sync PR, provide the public PR number or URL. The automation locates the private branch, fetches upstream changes, merges, resolves conflicts, pushes updates, and verifies the PR state.

What's the best way to automate fixing merge conflicts between a public PR and a private sync branch?▼

Automating private sync PR conflict resolution involves parsing the public PR, switching to the sync-upstream branch, merging upstream changes, and pushing the resolved result back to the private repository to verify the PR status.

When do I need to resolve conflicts on the sync-upstream/pr branch?▼

You need to resolve conflicts on the sync-upstream/pr branch when a public PR triggers a private sync PR and encounters merge conflicts during the automated upstream synchronization process.

Do I need the full PR URL to start resolving private sync conflicts?▼

No, you do not need the full PR URL to start resolving private sync conflicts; providing just the public PR number is sufficient to locate the corresponding private repository and branch.

Can I use this to sync upstream changes to any private repository?▼

This specifically resolves conflicts for the private 'clickhouse-private' repository tracking upstream changes from a corresponding public PR on the sync-upstream/pr/<PR_NUMBER> branch.

Why does my private sync PR encounter conflicts during an upstream merge?▼

A private sync PR encounters conflicts during an upstream merge because the public PR changes and the private sync branch have diverged, requiring automated conflict resolution and push updates to verify the PR state.