skills.rest
ClickHouse
ClickHouseOFFICIAL
Explore all skills by this author →
Website𝕏@ClickHouseDBGitHub

fix-sync

Resolve merge conflicts in ClickHouse sync PRs between public and private repositories.

49.1k|8.8k|Updated Jun 2, 2016
Search Tags:#automation#git#GitHub CLI#pull-request#merge-conflicts#private-repo
One-click install
npx skills add https://github.com/ClickHouse/ClickHouse --skill fix-sync
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: fix-sync
Source: https://github.com/ClickHouse/ClickHouse/tree/main/.claude/skills/fix-sync
Command: npx skills add https://github.com/ClickHouse/ClickHouse --skill fix-sync

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

This Skill automates resolving merge conflicts in the ClickHouse PR synchronization workflow between the public ClickHouse/ClickHouse repository and the private clickhouse-private repository.

Core Features & Use Cases

  • Automated conflict resolution workflow: Parses a PR number or URL, locates the corresponding private sync PR, and initiates a merge against master to surface conflicts.
  • Cross-repo synchronization support: Handles the common ClickHouse private/public sync PR scenario to unblock CI checks.
  • Manual intervention optional: When conflicts are complex, prompts for user guidance before finalizing the merge or push.

Quick Start

Run the skill with a PR number or URL to resolve conflicts in the private sync PR. Examples: /fix-sync 96005 or /fix-sync https://github.com/ClickHouse/ClickHouse/pull/96005

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 GitHub pull request sync workflow?▼

To resolve merge conflicts in a GitHub pull request sync workflow, you can parse a PR number to locate the corresponding private sync PR, fetch branches, merge against master, resolve conflicts, and push the commit.

How does cross-repo synchronization handle merge conflicts between public and private repositories?▼

Cross-repo synchronization handles merge conflicts by applying automated fetch, merge, and push steps to a private sync PR triggered by a public PR, unblocking CI checks when conflicts block automation.

Do I need the GitHub CLI to automate pull request conflict resolution?▼

You need tools that parse PR URLs and execute fetch, merge, commit, and push operations across public and private repository contexts to automate pull request conflict resolution via the GitHub CLI.

What is the best way to unblock CI checks when a private sync PR has merge conflicts?▼

The best way to unblock CI checks when a private sync PR has merge conflicts is to apply an automated fetch, merge, resolve, commit, and push workflow using the public PR number to clear the blockage.

When should I expect manual intervention during automated merge conflict resolution?▼

You should expect manual intervention during automated merge conflict resolution when conflicts are complex, prompting for user guidance before finalizing the merge or push to the private repository.

Related Skills

Explore More Software Engineering Skills→
tusharg1993tusharg1993

fix-sync

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

Community
Advanced
BaneeishaqueBaneeishaque

Git Submodule Commit Details

Aggregate submodule commit metadata and registration URLs for parent-repo synchronization.

Community
Intermediate
codacy-open-source-projects-scanscodacy-open-source-projects-scans
1

fix-sync

Resolve merge conflicts in ClickHouse sync pull requests using the gh CLI.

Official
Advanced
ousiassousiass

resolve-conflicts-en

Resolve GitHub pull request merge conflicts using an isolated Git worktree.

Community
Advanced