New Features
- The setup assistant now correctly handles existing configuration settings in global Git metadata (#5201)
- When Git Town is unconfigured, it now runs the full setup assistant instead of just asking for the main branch (#5057)
git town set-parentnow presents the same hierarchical branch list asgit town switch(#5259)- When prompting for a parent branch, Git Town now also shows the hierarchical list from
git town switch(#5266) - Added a configuration option and CLI switch to disable automatic resolving of phantom merge conflicts for cases where manual conflict resolution is preferred (#5317)
Bug Fixes
- Phantom merge conflicts are now auto-resolved even when your stack is rooted in a perennial branch instead of the main branch (#5193)
- The
glabconnector now correctly updates merge proposal targets (#5283) - Git Town now also removes branch type overrides when it deletes branches that were shipped at the remote (#5274)
- The setup assistant now cleans up local Git metadata when you opt to save configuration globally (#5230)
Contributors
Shoutout to @Ydot19, @kevgo, @thekarel for contributing code, ideas, and bug reports to 145 shipped PRs 5 resolved issues! 🚀