Skip to content

feat: branch switcher#1095

Merged
jonathanlab merged 2 commits intomainfrom
03-03-feat_branch_switcher
Mar 4, 2026
Merged

feat: branch switcher#1095
jonathanlab merged 2 commits intomainfrom
03-03-feat_branch_switcher

Conversation

@jonathanlab
Copy link
Contributor

@jonathanlab jonathanlab commented Mar 3, 2026 •
edited
Loading

This adds a branch switcher to both the task creation screen and the chat box.

For worktrees, this is the worktree creation behavior based on what branch is selected:

  • if trunk was selected, copy the state to the worktree. Then detach.
  • if any other branch was selected, try to check out to it, do not detach.
  • If that fails due to branch already being occupied somewhere else, copy, then detach.

image.png

Closes #849, Closes #763, Closes #824, Closes #941

@jonathanlab jonathanlab mentioned this pull request Mar 3, 2026
Merged
@jonathanlab Graphite App
Copy link
Contributor Author

jonathanlab commented Mar 3, 2026 •
edited
Loading

This stack of pull requests is managed by Graphite. Learn more about stacking.

@jonathanlab jonathanlab requested a review from a team March 3, 2026 16:33
@jonathanlab jonathanlab marked this pull request as ready for review March 3, 2026 16:33
@jonathanlab jonathanlab force-pushed the 03-03-feat_branch_switcher branch from 80efc02 to 41df1e2 Compare March 3, 2026 16:47
@jonathanlab Graphite App
Copy link
Contributor Author

jonathanlab commented Mar 4, 2026 •
edited
Loading

Merge activity

  • Mar 4, 8:08 AM UTC: A user started a stack merge that includes this pull request via Graphite.
  • Mar 4, 8:10 AM UTC: Graphite rebased this pull request as part of a merge.
  • Mar 4, 8:16 AM UTC: Graphite couldn't merge this PR because it was not satisfying all requirements (Failed CI: 'integration-test').

@jonathanlab jonathanlab changed the base branch from 02-25-feat_combobox to graphite-base/1095 March 4, 2026 08:09
@jonathanlab jonathanlab changed the base branch from graphite-base/1095 to main March 4, 2026 08:09
@jonathanlab jonathanlab force-pushed the 03-03-feat_branch_switcher branch from 41df1e2 to bf5100a Compare March 4, 2026 08:09
@jonathanlab jonathanlab force-pushed the 03-03-feat_branch_switcher branch from bf5100a to b30f28d Compare March 4, 2026 09:24
@jonathanlab jonathanlab enabled auto-merge (squash) March 4, 2026 09:30
@jonathanlab jonathanlab merged commit c59f529 into main Mar 4, 2026
13 checks passed
@jonathanlab jonathanlab deleted the 03-03-feat_branch_switcher branch March 4, 2026 09:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@charlesvien charlesvien charlesvien approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Offer to "Branch here" if on trunk, instead of commiting select branch per worktree I want to set the worktree base branch Better branch control

2 participants

@jonathanlab @charlesvien