skills.rest
codacy-open-source-projects-scans
codacy-open-source-projects-scansOFFICIAL
Explore all skills by this author →
GitHub

fix-sync

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

1|Updated Jul 29, 2024
Search Tags:#automation#git#ci/cd#github#merge conflicts#clickhouse
One-click install
npx skills add https://github.com/codacy-open-source-projects-scans/clickhouse --skill fix-sync-codacy-open-source-projects-scans
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: fix-sync
Source: https://github.com/codacy-open-source-projects-scans/clickhouse/tree/main/.claude/skills/fix-sync
Command: npx skills add https://github.com/codacy-open-source-projects-scans/clickhouse --skill fix-sync-codacy-open-source-projects-scans

SYSTEM DOCUMENTATION & REQUIREMENTS

💡 This Skill requires gh, and includes scripts (resource) and references (resource) components.

What problem does it solve?

This Skill automatically resolves merge conflicts in the clickhouse-private sync pull requests that are generated when changes are made to the public ClickHouse/ClickHouse repository, ensuring CI jobs do not remain pending due to these conflicts.

Core Features & Use Cases

  • Automated Conflict Resolution: Identifies and resolves merge conflicts in sync PRs.
  • Private Repo Integration: Works seamlessly with the ClickHouse/clickhouse-private repository.
  • Use Case: When a developer pushes changes to ClickHouse/ClickHouse, a corresponding sync PR is created in clickhouse-private. If this sync PR has conflicts, this skill can be invoked to fix them, allowing the CI to pass and the sync to complete.

Quick Start

Use the fix-sync skill to resolve conflicts for pull request number 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 ClickHouse sync pull requests automatically?▼

You can resolve ClickHouse sync pull request conflicts by fetching the sync branch, merging upstream master, prioritizing upstream changes, and pushing the resolved branch back to the private repository.

Why do pending CI jobs occur in clickhouse-private after pushing to the public ClickHouse repository?▼

Pending CI jobs in clickhouse-private occur because pushing changes to the public ClickHouse repository creates a corresponding sync PR that often has merge conflicts, blocking the CI pipeline from passing and completing the sync.

Do I need the gh CLI and local Git access to resolve ClickHouse private repository sync conflicts?▼

Yes, resolving ClickHouse private repository sync conflicts requires the gh CLI and local Git access to the ClickHouse/clickhouse-private repository to automate fetching, merging, and pushing the resolved sync branch.

How does prioritizing upstream changes work when fixing ClickHouse sync PR conflicts?▼

Prioritizing upstream changes during ClickHouse sync PR conflict resolution means the automation fetches the sync branch and merges the upstream master, automatically resolving any conflicts by favoring the upstream master branch modifications.

What is the best way to fix a blocked ClickHouse sync pull request for a specific PR number?▼

The best way to fix a blocked ClickHouse sync pull request for a specific PR number is invoking the fix-sync automation, which fetches the sync branch, resolves conflicts using upstream master priority, and pushes the resolved branch.

Are there limitations when automating ClickHouse private repository merge conflict resolution?▼

A key limitation is that this conflict resolution automation is specifically designed for the ClickHouse/clickhouse-private repository and requires local Git access and the gh CLI, restricting its use in other repository environments.

Related Skills

Explore More Software Engineering Skills→
tusharg1993tusharg1993

fix-sync

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

Community
Advanced
markus41markus41
18

harness-code-integration

Automate Harness Code repository management, triggers, CI/CD pipelines, and GitOps for AWS EKS.

Community
Advanced
tribedotruntribedotrun
8

mando-pr

Create GitHub pull requests and trigger AI reviewers with CI monitoring.

Official
Advanced
ClickHouseClickHouse
49.1k

fix-sync

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

Official
Advanced