Post
GitButler ⧓
gitbutler.com
did:plc:34rtbtb3dyhcdkevur5zvvzu
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.
2026-02-11T09:02:03.850Z