Post

Mladen Mijatov
@meaneye.bsky.social

That CLI looks sweet, but the fact GitButler requires me to create and work on separate branch is not. I really dislike tools which force me to change my workflow.

Caleb Owens
@cto.je

Hey! We hear you. One of the things we've been working on behind the scenes has been supporting working on a single checked out branch.

Mladen Mijatov
@meaneye.bsky.social

That's great to hear. I don't wish to come off as mean but once you have established workflow any change, especially demanded by tool you might not end up using, comes off as annoying.

Bram Geron #naza
@bram.xyz

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 ⧓
@gitbutler.com

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.