Post

Now GitButler has a CLI! Stacked and parallel branches, smartlog, simple commit editing, easy undo, json output to every command. And it just works in any Git repo. Check it out: blog.gitbutler.com/but-cli

This looks very nice. Congrats! I’d love to see more on how stacked branches work with GitButler.

Particularly the hard scenarios, with a squash-based GH repo, and maybe a small actual merge conflict. How well does GitButler support such real life scenarios?

GitButler supports first class conflicts similar to JJ letting you perform a rebase and resolve conflicts as needed. Detecting integrated squash commits is a difficult problem. We do try to detect them, but sometimes they slip through. We are are actively trying to improve this system.