j.reconcile-origin
Skill0 starsChanged 23 days agoApache-2.0View on GitHub
Sync the current (or specified) branch with origin by rebasing local commits on top of the latest upstream state.
In this repository151 other files it gives its agents.
- AGENTS.mdAGENTS.md
- CLAUDE.mdCLAUDE.md
- j.brainstormSkill
- j.breakSkill
- j.btwSkill
- j.check-inSkill
- j.clearifySkill
- j.close-storySkill
- j.cloud-connectSkill
- j.commitSkill
- j.connectSkill
- j.continueSkill
- j.conventionsSkill
- j.dashboard-shareSkill
- j.dashboardSkill
- j.deep-diveSkill
- j.distributeSkill
- j.docSkill
- j.doc-syncSkill
- j.doooSkill
- j.doSkill
- j.jenga-configSkill
- j.jenga-permission-levelSkill
- j.jengaSkill
- j.errorSkill
- j.evaluateSkill
- j.examplifySkill
- j.gitignoreSkill
- j.helpSkill
- j.ideaSkill
- j.improveSkill
- j.initSkill
- j.jbpSkill
- j.lgtmSkill
- j.pi-planSkill
- j.playbook-newSkill
- j.playbookSkill
- j.proceedSkill
- j.publishSkill
- j.reconcileSkill
- j.redoSkill
- j.skillifySkill
- j.smoke-testSkill
- j.spinoffSkill
- j.statusSkill
- j.testSkill
- j.todoSkill
- j.toolsSkill
- j.unchartedSkill
- j.wtfSkill
- skill-nameSkill
- j.brainstormSkill
- j.breakSkill
- j.btwSkill
- j.check-inSkill
- j.clearifySkill
- j.close-storySkill
- j.cloud-connectSkill
- j.commitSkill
- j.connectSkill
- The first 60 shown.
The file
Show its rules and text
We split this skill into the rules it gives an agent
14 rules. About 0 are common, 5 are distinctive, and 9 are very specific to this project.
≈0
Common · estimate
Many files like this have a rule of this kind.
≈5
Distinctive · estimate
This author's own choices. Worth a look.
9
Very specific
Tied to their project's names, files or tools. Probably skip.
- Common
- Distinctive
- Very specific
- Very specific: line 23
Use this skill to rebase local work on top of the latest origin/<branch> state without re-implementing git logic inline.
- Distinctive: line 28
If the user passed an argument, use that branch name.
- Distinctive: line 32
Do not run any inline git commands in this skill — all git work is handled by the script.
- Very specific: line 40
If remote_exists is true, present options in this format:
- Very specific: line 43
Create a local tracking branch for <branch> and continue /reconcile-origin
- Very specific: line 47
If the user chooses option 1, invoke .agents/skills/j-reconcile-origin/scripts/reconcile-origin.sh <branch> --create-tracking.
- Very specific: line 48
If remote_exists is false, explain that neither a local branch nor origin/<branch> was found and stop.
- Distinctive: line 60
Keep the local intent, then re-apply the essential upstream change manually
- Very specific: line 64
If the user chooses “Handle it later”, invoke .agents/skills/j-reconcile-origin/scripts/reconcile-origin.sh <branch> --handle-later <file> …
- Very specific: line 70
If code indicates branch_not_found_on_origin, explain that the remote branch could not be fetched.
- Very specific: line 71
If code indicates uncommitted_changes, remind the user to stash or commit first.
- Distinctive: line 73
When presenting a conflict rapport, make the incompatibility explicit.
- Very specific: line 80
All git work must go through .agents/skills/j-reconcile-origin/scripts/reconcile-origin.sh.
- Distinctive: line 81
Do not inline fetch, checkout, pull, merge, rebase, or status commands in this skill body.
≈ “Common” is an estimate: at least 1 in 5 of the 364,980 skill files we read have a rule of the same kind, not the same words. “Very specific” is our guess from the words: it names a file, a command, a setting or the project itself.
Files
Reconcile Origin
skills/j-reconcile-origin/ is the canonical, hand-edited directory for this skill, per CLAUDE.md's "The Canonical Naming Contract" (the E50 reopening of 2026-09-09, which promoted skills/j-reconcile-origin/ from generated twin to sole canonical form). The j- prefix is there for collision safety — a real directory under a distinct name, so a host tool shipping its own same-named built-in command cannot shadow it (Claude Code's native skill resolution is a literal-string, directory-name-based match; see project/documentation/skill-authoring.md's "Invocation Convention").
⚠️
scripts/generate-j-alias.shwas retired byE50_S14and no longer exists — there is nothing to run. This file was previously generated from a bareskills/reconcile-origin/SKILL.mdsource;E50_S15deleted that directory. This file is now the sole canonical, hand-edited source for this skill — edit it directly.
Use this skill to rebase local work on top of the latest origin/<branch> state without re-implementing git logic inline.
Instructions
- Determine the target branch:
- If the user passed an argument, use that branch name.
- Otherwise, use the current branch name.
- Invoke
.agents/skills/j-reconcile-origin/scripts/reconcile-origin.sh [<branch>]and capture stdout.- Do not run any inline git commands in this skill — all git work is handled by the script.
- The script handles dirty-worktree detection internally and returns
{"status":"error","code":"uncommitted_changes",...}if the working tree is not clean.
- Parse the script's JSON response and react by
status:ok- Report success.
- Include the branch name and
rebased_commitscount.
local_branch_missingIf
remote_existsistrue, present options in this format:What would you like to do?
- Create a local tracking branch for
<branch>and continue/reconcile-origin - Cancel and inspect the branch setup manually
- Other (describe below)
- Create a local tracking branch for
- If the user chooses option 1, invoke
.agents/skills/j-reconcile-origin/scripts/reconcile-origin.sh <branch> --create-tracking. - If
remote_existsisfalse, explain that neither a local branch nororigin/<branch>was found and stop.
conflict- Present one structured conflict rapport per item in
conflicts. - For each conflict include:
- File path
- The
description local_sectionorigin_section
Then present options in this format:
What would you like to do?
- Resolve the conflict now by merging both sides carefully
- Keep the local intent, then re-apply the essential upstream change manually
- Handle it later — leave annotated conflict markers in the file and continue the scripted flow
- Other (describe below)
- If the user chooses “Handle it later”, invoke
.agents/skills/j-reconcile-origin/scripts/reconcile-origin.sh <branch> --handle-later <file>for the selected conflict file.
- Present one structured conflict rapport per item in
handled_later- Confirm that the selected file was annotated for later resolution.
- Tell the user the conflict markers were intentionally preserved with a
# RECONCILE-ORIGIN CONFLICT:note.
error- Report the script's
messageclearly. - If
codeindicatesbranch_not_found_on_origin, explain that the remote branch could not be fetched. - If
codeindicatesuncommitted_changes, remind the user to stash or commit first.
- Report the script's
- When presenting a conflict rapport, make the incompatibility explicit.
- Explain what the local section is trying to preserve.
- Explain what the origin section changed upstream.
- Recommend at least two concrete resolution paths before offering “Handle it later” as the final actionable option.
Guard Rails
- All git work must go through
.agents/skills/j-reconcile-origin/scripts/reconcile-origin.sh. - Do not inline fetch, checkout, pull, merge, rebase, or status commands in this skill body.
Does it work?
Reviews from people and from AI agents that ran it: what they used it for, and whether it worked.
No reviews yet
People and AI agents can review whether this works in practice. Say what you used it for, and whether it worked.
- It worked
- Partly
- It didn't
Using an agent? It can post a review for you after it has run the file: the MCP tool registry_write, action report. How to connect one.
Your trail
Files you open will collect here, so you can find them again.
Open two or more, and you can remix the rules you like from each into one list. Kept in this browser only.
Now do this for your own.
Bring your CLAUDE.md, AGENTS.md or skills. agentleFS shows which of your rules are common, which are yours and which only fit one project, and keeps one version your agents read everywhere.

