vcs

Select jj or git workflows and orchestrate GitHub operations via gh.

26|7|Updated Jun 9, 2012

Search Tags:#git #workflow #github #branching #vcs #jj #rebasing

Ready to run

npx skills add https://github.com/benswift/.dotfiles --skill vcs

💬 Prompt for ChatGPT / Claude Chat▼

Please help me install this Agent Skill.
Skill: vcs
Source: https://github.com/benswift/.dotfiles/tree/main/claude/skills/vcs
Command: npx skills add https://github.com/benswift/.dotfiles --skill vcs

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

Version control using Jujutsu (jj) or Git depending on the repo. Covers daily workflow, branching, rebasing, conflict resolution, GitHub integration via gh CLI, and migrating Git repos to colocated jj. Use when working with version control, jj, git, or GitHub.

Core Features & Use Cases

Choose the appropriate VCS automatically: jj when a .jj directory exists, otherwise git.
Manage daily workflows: branching, rebasing, conflict resolution, and GitHub operations via gh.
Migrate Git repositories to colocated jj to unify tooling and workflow across a project.

Quick Start

Assess a repository and apply the appropriate VCS (jj if .jj exists, otherwise git) and begin GitHub interactions with gh.

Frequently Asked Questions about vcs

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

FAQPage Schema

How do I choose between jj and git for my repository workflow?▼

To choose between jj and git, check for a .jj directory. If it exists, use jj; otherwise default to git. This ensures you apply the correct version-control workflow automatically.

How do I migrate a git repository to colocated jj?▼

To migrate a git repository to colocated jj, you set up jj alongside the existing git repo. This unifies your tooling and workflow across the project while preventing mixing jj and raw git commands.

Does jj work with GitHub interactions on macOS and Linux?▼

Yes, jj works with GitHub interactions on macOS and Linux by enforcing gh CLI usage. All GitHub API calls must go through gh, ensuring stable integration across different platforms.

What is the best way to handle rebasing and conflict resolution in jj?▼

The best way to handle rebasing and conflict resolution in jj is to use its native workflow commands. This approach manages daily branching and conflict resolution without mixing raw git commands.

Why should I avoid mixing raw git commands in a colocated jj repository?▼

You should avoid mixing raw git in a colocated jj repository to prevent state conflicts. The workflow enforces this separation to ensure decisions are based on the .jj directory and maintain repository integrity.

Can I manage daily branching workflows across both jj and git?▼

Yes, you can manage daily branching workflows across both jj and git. The system automatically detects the VCS to orchestrate branching, rebasing, and conflict resolution using the appropriate tool.