Skip to content

fix: clarify pnpm reset must be run from main - #92

Open
jknight wants to merge 37 commits into
ai-hero-dev:live-run-throughfrom
jknight:jknight/pnpm-reset
Open

fix: clarify pnpm reset must be run from main#92
jknight wants to merge 37 commits into
ai-hero-dev:live-run-throughfrom
jknight:jknight/pnpm-reset

Conversation

@jknight

@jknight jknight commented Apr 4, 2026

Copy link
Copy Markdown

Issue reported here: https://discord.com/channels/1316387060357140520/1489805152482492586

The helper pnpm reset fails if users are on live-run-through, which they could be if they're poking around the codebase:

$ pnpm reset

> cadence-course-platform@ reset /Users/jknight/Projects/cohort-003-project
> ai-hero-cli reset --branch=live-run-through --upstream=https://github.com/ai-hero-dev/cohort-003-project.git

From https://github.com/ai-hero-dev/cohort-003-project
 * branch            live-run-through -> FETCH_HEAD
error: cannot delete branch 'live-run-through' used by worktree at '/Users/jknight/Projects/cohort-003-project'
fatal: a branch named 'live-run-through' already exists
Unexpected error: FailedToTrackBranchError: Failed to track branch.
 ELIFECYCLE  Command failed with exit code 1.

This PR adds a little hint that they should switch back to main before running pnpm reset:

$ pnpm reset

> cadence-course-platform@ reset /Users/jknight/Projects/cohort-003-project
> git branch --show-current | grep -qx main && ai-hero-cli reset --branch=live-run-through --upstream=https://github.com/ai-hero-dev/cohort-003-project.git || (echo 'Error: pnpm reset must be run from the main branch. Run: git checkout main' && exit 0)

Error: pnpm reset must be run from the main branch. Run: git checkout main

mattpocock and others added 30 commits April 2, 2026 09:12
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
…able

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
mattpocock and others added 7 commits April 2, 2026 09:12
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
…eset --branch=live-run-through --upstream=https://github.com/ai-hero-dev/cohort-003-project.git || (echo 'Error: pnpm reset must be run from the main branch. Run: git checkout main' && exit 0)",
@jknight jknight changed the title "reset": "git branch --show-current | grep -qx main && ai-hero-cli … fix: clarify pnpm reset must be run from main Apr 4, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants