Skip to content

but cli: Simple workflow doesn't work #12997

@jpambrun

Description

@jpambrun

Version

0.19.6

Operating System

Linux

Distribution Method

winget (Windows)

Describe the issue

My Distribution Method is not listed, I used the curl installer.
I am using but for the first time. Just trying to have 2 branch checked out, but it doesn't seem to stage correctly.
The stage operation seem to work, but the worktree remains dirty, then but commit fails with

Initiated a background sync... Error: Worktree changes would be overwritten by checkout: "frontends/admin-panel/src/pages/WorklistBuilder/components/ColumnsContents/utils.ts" 

❯ git --version
git version 2.53.0
❯ but --version
but 0.19.6

How to reproduce (Optional)

Setting up your project for GitButler tooling. Some things to note: - Switching you to a special `gitbutler/workspace` branch to enable parallel branches - Installing Git hooks to help manage commits on the workspace branch To undo these changes and return to normal Git mode, either: - Directly checkout a branch (`git checkout tim/fix-rebase`) - Run `but teardown` More info: https://docs.gitbutler.com/workspace-branch █████ █████ ██████╗ ██╗ ██╗████████╗ █████ █████ ██╔══██╗██║ ██║╚══██╔══╝ ████████ ██████╔╝██║ ██║ ██║ █████ █████ ██╔══██╗██║ ██║ ██║ █████ █████ ██████╔╝╚██████╔╝ ██║ The command-line interface for GitButler $ but branch new <name> Create a new branch $ but status View workspace status $ but commit -m <message> Commit changes to current branch $ but push Push all branches $ but teardown Return to normal Git mode Learn more at https://docs.gitbutler.com/cli-overview Initiated a background sync... ╭┄zz [unstaged changes] ┊ rx M frontends/admin-panel/src/pages/WorklistBuilder/components/ColumnsContents/ListContainer.tsx ┊ yr M frontends/admin-panel/src/pages/WorklistBuilder/components/ColumnsContents/utils.ts ┊ ┊╭┄ti [tim/fix-rebase] ┊● 240b15973 wip ├╯ ┊ ┴ e92089ad1 [origin/main] 2026-03-23 feat/frontend-connects-dev-backend Hint: run `but diff` to see uncommitted changes and `but stage <file>` to stage them to a branch …/newvue on gitbutler/workspace [!] via 🥟 v1.3.11 ❯ but branch new jpambrun/worklist-setting-fix Initiated a background sync... ✓ Created branch jpambrun/worklist-setting-fix …/newvue on gitbutler/workspace [!] via 🥟 v1.3.11 ❯ but Initiated a background sync... ╭┄zz [unstaged changes] ┊ rx M frontends/admin-panel/src/pages/WorklistBuilder/components/ColumnsContents/ListContainer.tsx ┊ yr M frontends/admin-panel/src/pages/WorklistBuilder/components/ColumnsContents/utils.ts ┊ ┊╭┄im [tim/fix-rebase] ┊● 240b15973 wip ├╯ ┊ ┊╭┄jp [jpambrun/worklist-setting-fix] (no commits) ├╯ ┊ ┴ e92089ad1 [origin/main] 2026-03-23 feat/frontend-connects-dev-backend Hint: run `but diff` to see uncommitted changes and `but stage <file>` to stage them to a branch …/newvue on gitbutler/workspace [!] via 🥟 v1.3.11 ❯ but stage rx,yr jp Initiated a background sync... Staged the only hunk in frontends/admin-panel/src/pages/WorklistBuilder/components/ColumnsContents/ListContainer.tsx in the unassigned area → [jpambrun/worklist-setting-fix]. Staged all hunks in frontends/admin-panel/src/pages/WorklistBuilder/components/ColumnsContents/utils.ts in the unassigned area → [jpambrun/worklist-setting-fix]. …/newvue on gitbutler/workspace [!] via 🥟 v1.3.11 ❯ but Initiated a background sync... ╭┄zz [unstaged changes] ┊ no changes ┊ ┊╭┄im [tim/fix-rebase] ┊● 240b15973 wip ├╯ ┊ ┊ ╭┄n0 [staged to jpambrun/worklist-setting-fix] ┊ │ ow M frontends/admin-panel/src/pages/WorklistBuilder/components/ColumnsContents/ListContainer.tsx ┊ │ wt M frontends/admin-panel/src/pages/WorklistBuilder/components/ColumnsContents/utils.ts ┊ │ ┊╭┄jp [jpambrun/worklist-setting-fix] (no commits) ├╯ ┊ ┴ e92089ad1 [origin/main] 2026-03-23 feat/frontend-connects-dev-backend Hint: run `but diff` to see uncommitted changes and `but stage <file>` to stage them to a branch …/newvue on gitbutler/workspace [!] via 🥟 v1.3.11 ❯ but commit jp -m test Initiated a background sync... Error: Worktree changes would be overwritten by checkout: "frontends/admin-panel/src/pages/WorklistBuilder/components/ColumnsContents/utils.ts" …/newvue on gitbutler/workspace [!] via 🥟 v1.3.11 ❯ git st On branch gitbutler/workspace Changes not staged for commit: (use "git add <file>..." to update what will be committed) (use "git restore <file>..." to discard changes in working directory) modified: frontends/admin-panel/src/pages/WorklistBuilder/components/ColumnsContents/ListContainer.tsx modified: frontends/admin-panel/src/pages/WorklistBuilder/components/ColumnsContents/utils.ts no changes added to commit (use "git add" and/or "git commit -a") 

Expected behavior (Optional)

I expect the simple new branch, stage commit workflow to work.

Relevant log output (Optional)

Metadata

Metadata

Assignees

No one assigned

    Labels

    CLIThe command-line program `but`bugSomething isn't workingfeedback requestedFeedback was requested to help resolve the issue

    Type

    No type

    Projects

    No projects

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions