alt Hacker NewsI couldn't figure out this part of GitButler. I downloaded it and tried it (since I respect Scott Chacon and remember learning so much about Git from his well-written git guides).
But it was just a bit too much cognitive dissonance for me to try it.
It seems like the next big thing is parallel coding... I've tried GitButler, Spectator, Vibe-Kanban, and Conductor in the past week. And there is now FleetCode.
I liked Spectator's idea (use a separate docker container for each) but it didn't quite work right. So back to worktrees which seem to work just fine.
At some point, we will probably consolidate on 2-3 dominant tools in this space.
I wonder if even work trees will be needed if we can do a "create a copy-on-write version of my code folder" which would result in nearly zero-cost copies of the repo.
Somehow the GitButler workflow works great for me and it is the first VC software that made me drop Magit after a decade of daily use.
I do not use it collaboratively. I use it to continuously ship smaller things while working on bigger pieces and I constantly move independent changes around to different “lanes” to ship frequently as parts of my work mature.
With Magit I used staging area and amended commits continuously. With GitButler I “assign” files or chunks by dragging them into lanes as I am happy with the changes, and when I have a logical unit I commit it. Having this multiple staging areas has been a great workflow improvement as well.