skills.rest
edmundmiller
edmundmillerCOMMUNITY
Explore all skills by this author →
WebsiteGitHub

jj-conflicts

Identify conflicts in jj repositories and outline resolution commands.

78|6|Updated May 19, 2017
Search Tags:#restore#merge#resolve#divergent#jj conflicts
One-click install
npx skills add https://github.com/edmundmiller/dotfiles --skill jj-conflicts
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: jj-conflicts
Source: https://github.com/edmundmiller/dotfiles/tree/main/config/claude/plugins/jj/skills/jj-conflicts
Command: npx skills add https://github.com/edmundmiller/dotfiles --skill jj-conflicts

SYSTEM DOCUMENTATION & REQUIREMENTS

💡 This Skill includes references (resource) components.

What problem does it solve?

This Skill helps you identify unresolved conflicts in jj, choose safe resolution paths, and use path-scoped restorations to preserve work.

Core Features & Use Cases

  • Conflict identification: Find commits with conflicts using jj log and status.
  • Resolution strategies: Use jj resolve for most cases or jj restore with --from for safe, path-specific restorations.
  • Safety-first workflows: Learn to squash or revert in a controlled manner to maintain history integrity.

Quick Start

When a conflict appears after a merge, inspect with jj diff, then choose a resolution path with jj resolve or jj restore for specific paths.

Frequently Asked Questions about jj-conflicts

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

FAQPage Schema
How do I identify conflicts in a jj repository?▼

Identify conflicts in jj by running `jj log` to list commits with unresolved conflicts, or use `jj status` to check the current working directory. Inspect conflict details with `jj diff` to see the conflicting changes side-by-side before resolution.

What's the best way to resolve conflicts in jj?▼

For most conflicts, use `jj resolve` to accept one side or manually merge changes. For path-specific resolution, use `jj restore --from` to safely restore individual files from a specific commit while preserving other changes.

Can I restore specific files from a conflicted commit in jj?▼

Yes, use `jj restore --from <commit>` to restore specific paths from a conflicted commit. This path-scoped operation preserves all non-specified changes and maintains a clear audit trail of resolution steps.

How do I handle deletion and renaming conflicts in jj?▼

Deletion and renaming conflicts are resolved using the same commands as two-sided conflicts. Use `jj diff` to inspect how jj represents the conflict, then apply `jj resolve` or `jj restore` depending on whether you want interactive resolution or path-specific restoration.

Does jj support safe, controlled conflict resolution workflows?▼

Yes, jj provides safety-first workflows through path-scoped restorations with `jj restore --from`, allowing you to resolve conflicts incrementally. You can squash or revert in a controlled manner while maintaining full history integrity and auditability.

Related Skills

Explore More Software Engineering Skills→
PorkbuttsPorkbutts
1

bootstrap-project

Initialize Node.js/TypeScript projects with CI/CD pipelines and pre-commit hooks.

Community
Intermediate
KiloforgeKiloforge
2

kf-conflict-resolver

Resolve git merge conflicts during push or pull sync operations.

Official
Advanced
warpcodewarpcode
2

git-workflow

Route git operations to reference-backed guidance for status, diff, log, commits, branches, conflicts, and rebasing.

Community
Advanced
BrunoAlpezdevBrunoAlpezdev

merge-conflicts

Resolve Git merge conflicts file-by-file with staged incremental edits.

Community
Intermediate