skills.rest
samwelmunga
samwelmungaCOMMUNITY
Explore all skills by this author →
GitHub

j.reconcile-origin

Rebase local commits onto the latest origin branch state with structured conflict reporting.

Updated Aug 3, 2026
Search Tags:#git#version control#bash#rebase#conflict resolution#origin#branch sync
One-click install
npx skills add https://github.com/samwelmunga/jenga-npm --skill j-reconcile-origin-samwelmunga
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: j.reconcile-origin
Source: https://github.com/samwelmunga/jenga-npm/tree/main/.agents/skills/j-reconcile-origin
Command: npx skills add https://github.com/samwelmunga/jenga-npm --skill j-reconcile-origin-samwelmunga

SYSTEM DOCUMENTATION & REQUIREMENTS

💡 This Skill includes scripts (resource) components.

What problem does it solve? Keeping a local branch in sync with its upstream counterpart often involves manual git fetch, rebase, and conflict triage, with no structured way to inspect or defer conflicts. This Skill automates that flow through a single script that returns machine-readable JSON for every outcome. ## Core Features & Use Cases - Automated Rebase: Fetches origin/<branch> and rebases local commits on top, reporting the number of rebased commits. - Structured Conflict Reports: Parses conflict markers into per-file reports showing local and origin sections, so you can decide how to resolve each one. - Deferred Conflict Handling: Annotates a chosen conflicted file with a RECONCILE-ORIGIN CONFLICT note and continues the rebase, letting you resolve it later. - Use Case: You return to a feature branch after teammates merged upstream changes. Run the skill to rebase your work, review a structured conflict rapport for any overlapping edits, and either resolve immediately or mark files for later handling. ## Quick Start Ask the agent to sync your current branch with origin by rebasing your local commits on top of the latest upstream state.

Frequently Asked Questions about j.reconcile-origin

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

FAQPage Schema
How do I rebase my local branch on top of origin?▼

Invoke the skill with an optional branch name; it fetches origin/<branch> and rebases your local commits on top. The script reports the number of rebased commits as JSON, and all git operations run through the bundled script rather than inline commands.

How to handle git rebase conflicts without resolving them immediately?▼

Choose the handle-later option when a conflict report appears. The script annotates the conflicted file with a RECONCILE-ORIGIN CONFLICT comment block, stages it, and continues the rebase so you can resolve the markers at your own pace.

What happens if the local branch does not exist?▼

The script returns a local_branch_missing status indicating whether the branch exists on origin. If it does, you can create a local tracking branch automatically with the --create-tracking flag and continue the reconcile flow.

Why does reconcile-origin fail with uncommitted changes?▼

The script checks for a dirty worktree before rebasing and returns an uncommitted_changes error if any modifications exist. Stash or commit your changes first, then rerun the skill to proceed safely.

Can I run this while another rebase is in progress?▼

No. The script detects an in-progress rebase by checking for rebase-merge or rebase-apply directories and exits with a rebase_in_progress error. Resolve or abort the existing rebase before running the skill again.

Related Skills

Explore More Software Engineering Skills→
awfixers-stuffawfixers-stuff

git-rebase-sync

Rebase local feature branches onto the latest origin base with conflict handling.

Official
Advanced
baphledbaphled
1

auto-rebase

Rebase feature branches onto a target branch and force-push with lease.

Community
Intermediate
mikkermikker
102

refactor-pass

Remove dead code and simplify logic while preserving build and test behavior.

Community
Intermediate
syncfusionsyncfusion
60

syncfusion-maui-date-time-slider

Configure Syncfusion SfDateTimeSlider for date range selection in .NET MAUI apps.

Official
Advanced