Jj resolve conflicts

Skill TomerAberbach/claude-config/skills/jj-resolve-conflicts

🤖 My Claude Code config!

Install

npx -y skills add TomerAberbach/claude-config --skill jj-resolve-conflicts

Assembled from the repository path, not quoted from the project. Check it against their README if it does not work.

One thing to look at

0 stars0 stars. Stars are a popularity signal and not a quality one, but at this level it is likely that nobody has read this closely except its author, and you would be relying on your own review.

What its author says it does

Copied from the file, not written here

Resolve conflicts in the current `jj` commit.

SKILL.md

2.7 KB, as published. Nobody here has run it

Resolve conflicts in the current jj commit.

Current status

jj st

$ARGUMENTS

Principles

A resolution preserves the intent of both sides, not just their text. When both sides changed the same logic, produce code that does what each side set out to do
Never delete a conflict marker without understanding what each side changed and why
The resolved commit passes all checks: format, lint, typecheck, build, test

Workflow

Read the status above. If there are no unresolved conflicts, tell the user and stop
List the conflicted files with jj resolve --list
Find where the conflict came from: jj log -r '::@ & conflicts()' shows the conflicted ancestry. Read the descriptions of the commits whose changes collided to understand each side's intent
For each conflicted file:
- Read the file. Conflicts are materialized with markers (see "Reading conflict markers")
- If one side should win wholesale, run jj resolve --tool :ours <file> (side #1) or jj resolve --tool :theirs <file> (side #2)
- Otherwise edit the file to the semantic merge of both sides and remove the markers. When the markers alone are unclear, view each side's full file with jj file show -r <revision> <file>
Verify all conflicts are gone: jj resolve --list should report none and jj st should show no conflicted paths
Infer verification commands from project signals (e.g. package.json, Makefile, CI config) and run them. If no signals are found, ask the user
jj propagates the resolution to descendants of @ automatically. Run jj log -r 'conflicts()'; any conflicts that remain are distinct and need their own resolution

Reading conflict markers

jj materializes conflicts as a diff to apply, not two alternatives:

<<<<<<< Conflict 1 of 1
%%%%%%% Changes from base to side #1
-old line
+side #1's replacement
+++++++ Contents of side #2
side #2's version of the region
>>>>>>> Conflict 1 of 1 ends

The %%%%%%% section is a diff: lines starting with - are the base, lines starting with + are side #1's edit, and unprefixed lines are context
The +++++++ section is side #2's full content for the region
To resolve, apply side #1's diff to side #2's content, then reconcile whatever still disagrees

Fixing mistakes

The next jj command snapshots a wrong resolution. To get the conflict back, find the resolution's operation with jj op log and revert it with jj undo <operation>. With no argument, jj undo reverts the most recent operation.