Do I need the jj CLI installed to use this skill?

Yes, this skill relies on the presence of the Jujutsu toolset to execute workspace updates, fetches, and rebases.

How does this skill handle merge conflicts?

It provides a step-by-step resolution strategy that involves analyzing conflict markers and combining changes logically while prioritizing upstream bug fixes.

What is Jujutsu (jj)?

Jujutsu is a Git-compatible version control system designed for speed and safety. This skill automates common jj commands to simplify your development workflow.

What happens if the git fetch fails?

The skill includes error handling for network or authentication issues; it will report the specific failure and halt the process to prevent workspace corruption.

Jujutsu Workspace Sync

Name: Jujutsu Workspace Sync
Author: sjawhar

bysjawhar

•

開発者ツール

Syncs the current workspace with the latest main branch using Jujutsu version control commands.

This skill streamlines the process of keeping a Jujutsu (jj) workspace up to date with the remote repository. It automates the workflow of checking workspace health, fetching updates, and rebasing current work onto the main branch. Additionally, it provides a structured framework for conflict resolution and generates a summary of newly integrated commits to ensure developers maintain full context of upstream changes.

主な機能

01Summarization of incoming commits from origin/main

02Streamlined jj git fetch and rebase integration

032 GitHub stars

04Guided conflict resolution strategy for overlapping changes

05Automated workspace health validation

06Proactive error reporting for network and authentication issues

ユースケース

01Updating local work to include the latest features and bug fixes from main

02Quickly auditing recent upstream changes after a workspace rebase

03Resolving complex merge conflicts within a Jujutsu-based workflow

What are Skills?·How to Install

Install with 🐟 Skill.Fish

npx skillfish add sjawhar/dotfiles sync-main

For use in Claude.ai and ChatGPT

Download Skill