itdove/devaiflow#331: Branch workflow UX issues: missing branch selection prompt and outdated base branch#333
Conversation
- Display list of local branches when user declines to create new branch - Support branch selection by number or name with current branch default - Automatically checkout selected branch with error handling - Show current branch indicator in branch list 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com>
- Switch to default branch before creating new branch - Pull latest changes before branch creation - Prompt user for confirmation if pull operation fails - Add informative status messages during creation process 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
GitHub Issue: #331
Description
This PR addresses two UX issues in the branch workflow:
Branch selection when declining new branch creation: When users decline to create a new branch during
daf newordaf open, they are now prompted to select an existing branch instead of leaving them stranded.Up-to-date base branches: New branches are now created from an up-to-date version of the default branch. The CLI now fetches the latest changes from the remote default branch before creating new branches, preventing branches from being based on stale local commits.
These changes improve the user experience by providing clearer workflow options and ensuring branches start from the correct base state.
Assisted-by: Claude
Testing
Steps to test
daf newordaf open <issue>daf newand accept creating a new branchpytest tests/test_branch_workflow_ux_fixes.pyScenarios tested
Deployment considerations