Rebase session and memory Git branches onto main with conflict reporting.
npx skills add https://github.com/Kord96/kordinate --skill integrate-kord96
Please help me install this Agent Skill. Skill: integrate Source: https://github.com/Kord96/kordinate/tree/main/shared/skills/integrate Command: npx skills add https://github.com/Kord96/kordinate --skill integrate-kord96
Reconcile transient session or memory Git branches into main while making conflicts and cleanup explicit, preventing accidental force-pushes or hidden background mutations to user worktrees. The Skill centralizes safe integration workflows so operators can merge completed agent work or session edits without risking active processes or losing commits.
Run the integrate skill with optional --memory or a specific branch name to reconcile branches into main, report conflicts, and clean up merged worktrees.
High-intent search queries and answers about installing and using this skill.
Safe branch merging uses a detached-HEAD integration workspace to rebase session or memory branches onto main, fast-forwarding updates while enforcing no force-push to main. This prevents accidental data loss and provides explicit conflict reporting during integration.
A detached-HEAD integration worktree is an isolated Git workspace that reconciles session and memory branches with main by fetching origin main and rebasing changes. It surfaces conflicts explicitly without mutating active agent worktrees or risking hidden background changes.
Consolidating ephemeral agent worktrees involves discovering session/* branches, skipping active or empty ones, and rebasing them onto latest main within a detached-HEAD workspace. It fast-forwards main and performs explicit worktree cleanup after successful integration of completed agent work.
Yes, the integration workflow discovers and classifies session/* and memory/* branches, actively skipping those marked as active or empty. This protects running agent sessions from hidden background mutations while safely merging only completed worktrees into main.
When conflict resolution is needed during a branch rebase onto main, the integration process provides clear conflict reporting and avoids guessing on complex merges. Operators receive explicit conflict details within the detached-HEAD workspace to resolve them manually.
Yes, memory/* branches stored under KORDINATE_HOME can be integrated by targeting them during the reconciliation process. The workflow applies local updates to these memory branches and performs explicit cleanup after merging them into main.
apexbusiness-systemsGuide feature branch completion with four integration options after tests pass.
seankao31Rebase, fast-forward merge, and delete feature branches in Git worktrees.
open-haxCheck git branch, working tree, remotes, and submodules before destructive operations.
dupe-comResolve git rebase conflicts while preserving commit intent.
