branch-agent/SKILL.md

branch-agent/SKILL.md fix v3.9.1

@@ Step 4.5 — Detect Checkout Conflicts (new) @@
	## Step 4: Fetch Latest from Origin
+	## Step 4.5: Detect Checkout Conflicts
+	comm -12 \
+	<(git diff --name-only HEAD \| sort -u) \
+	<(git diff --name-only HEAD origin/<default> \| sort -u)
+	→ empty: no stash needed, uncommitted changes carry forward
+	→ non-empty: stash needed, record conflicting paths
@@ Step 5 — Create Branch (conditional stash path) @@
-	Run:
-	git checkout -b <branch> --no-track origin/<default>
-	On failure (branch already exists, dirty-tree conflict…): STOP
+	When stash needed:
+	git stash push -m "branch-agent auto-stash <branch>"
+	git checkout -b <branch> --no-track origin/<default>
+	git stash pop ← your changes restored on the new branch
	On pop conflict: preserve stash + recovery instructions + STOP

+52 -6

git-agent v3.9.1 · auto-stash on dirty checkout conflict

Fixed a sharp edge in Claude Code's branch-agent skill today.

The scenario: you're on a feature branch, have uncommitted changes, and run /git-agent:branch-agent to start fresh work. If any of those modified files also differ between your branch and origin/main, git refuses the checkout — it won't silently overwrite your work.

Old behaviour: raw git error → STOP. Manual stash, re-run, remember to pop.

The fix adds a conflict-detection step before the checkout:

comm -12 \
  <(git diff --name-only HEAD | sort -u) \
  <(git diff --name-only HEAD origin/<default> | sort -u)

This computes the exact intersection — files that are both modified locally and differ from origin. If non-empty, the skill auto-stashes, creates the branch, and pops your changes back. Transparently.

If stash pop itself conflicts, it stops with recovery instructions and never drops the stash. Nothing is lost.

Untracked files still carry forward normally — no unnecessary stashing.

Small fix, but the kind that makes automation feel trustworthy.

#ClaudeCode #GitTips #DeveloperTools #AIAgents

Twitter/X

Fixed branch-agent in Claude Code: when tracked files conflict on checkout, it now auto-stashes, creates the branch, and pops your changes back. Detects the exact conflict set via comm -12 before touching anything. /git-agent:branch-agent

Bluesky

Shipped a fix for branch-agent: instead of crashing when tracked files conflict on checkout, it detects the conflict set upfront (comm -12), stashes, creates the branch, and pops back. Untracked files still carry forward as-is. /git-agent:branch-agent