Transfer commits from a sibling checkout by applying their patches in order, without fetching repository history. The script checks for dirty-path conflicts, verifies patch IDs, and commits each change while avoiding unrelated staged files in the shared index.
Take commits from a sibling checkout as patches, without a fetch.
Run score Not tested
See how to installReview the instructions the agent will receive before you install.
Use this skill when another checkout of the monorepo on this machine holds commits that this checkout needs, for example a reorganization that a new change builds on. The user keeps the checkouts separate, so a clone, a worktree or a shared directory is not an option.
A git fetch /path/to/sibling walks and packs objects over the whole history. With a hundred upstream commits of
difference it took more than 15 minutes here, and a second fetch of 12 new commits did not finish in 10 minutes.
It also leaves a remote-tracking ref and a copy of every object behind. A patch carries only the change.
Find the range in the sibling. The base is the last sibling commit this checkout already has; a commit taken
before has a new hash here, so compare by subject or by patch id (git patch-id --stable), not by hash.
From the root of the receiving checkout run the script. It writes the patches under out/sibling-patches/,
refuses when a patch touches a path that is dirty here, then applies and commits each patch in order:
./community/.agents/skills/sibling-checkout-commits/scripts/take-patches.sh ../idea-2 <base>..master
Read the ok lines. Each one names the new commit and confirms that its patch id equals the patch. A DIFF line
stops the script; the commit on HEAD then holds something else, and the next patch is not applied.
On a weekend, the committer date is today: apply the weekend rule of the personal CLAUDE.md to the new commits.
git apply --binary changes the working tree only. git commit --only -- <paths> builds the commit from HEAD
plus those paths, so nothing that a concurrent session staged in the shared index lands in the commit.--only skips an untracked path. The
script marks every such path with git add -N first; an intent-to-add entry carries no content.git mailinfo.git am: git am commits the shared index, and a concurrent session's staged files would land in
the commit.git update-ref -d refs/remotes/<name>/master.A patch of the range depends on the patches before it, so a --check of a later patch alone fails. The script
applies in order. When a patch fails against this tree, the sibling and this checkout diverged on that path:
stop, name the path and the commit in the report, and let the user decide. Do not resolve the conflict by hand
inside a commit that carries the sibling author's name.
No reviews yet. Tell others what you thought.
No login needed. Share how it worked for you, ask a question, or note where it did not run.
No comments yet. Be the first to write one.
Implement or update IntelliJ `AnAction` classes and their `plugin.xml` registrations. Keep labels and descriptions in message bundles, configure optional icons, and launch suspending work through the event coroutine scope so synchronous action handling does not freeze the IDE.
Move IntelliJ JPS test modules to Bazel and diagnose failures that occur only under Bazel. The guide helps trace missing dependencies, plugins, test data, and runfiles, then verify the generated target and migrated tests.
Write or review Kotlin and Java code in line with IntelliJ project conventions. The guidance covers language choice, formatting, sealed types, threading annotations, and safe handling of control flow exceptions so changes fit the surrounding codebase.
Create, amend, or rename IntelliJ commits with messages that follow the project’s ticket and label formats. Keep each commit focused, explain the reason and decision in the body when needed, and pass the message safely through the shell or PowerShell.
Compare how Python type checkers interpret a code snippet or file. The script runs selected tools, including ty, pyrefly, basedpyright, mypy, and zuban, then produces a Markdown report with verdicts, timings, and each checker's diagnostic output.
Shape Compose Desktop UI code by keeping composables focused on rendering and placing application decisions in presenters or coordinators. Get guidance on state ownership, effects, reusable component APIs, lazy-list keys, animation, and performance for individual UI changes.