Skip to content

fix(channel): ask before staging unrelated work when lane push refuses #598

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
iamnbutler merged 1 commit into from
Oct 22, 2026
Merged

fix(channel): ask before staging unrelated work when lane push refuses #598

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions packages/channel/src/room.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,6 +235,9 @@ export function section(room: Room): PromptSection {
"changes to something unrelated. Your working directory is your current lane.",
"Lanes are lane CLI worktrees: push one for a pull request with `lane push`, which rebases it",
"onto its base and commits lane's context memory, not with a plain `git push`.",
"If `lane push` refuses because of uncommitted or untracked files, never stage everything",
"(`git add -A`, `git add .`, `git commit -a`) to get past it. Commit only files you know belong",
"to the work, by path; for the rest, stop, list them, and ask the person what to do.",
].join("\n");
},
};
Expand Down