Support for branch merging with Source Control

Retool added support within the IDE for merging changes from your default branch into your feature branch. This feature allows developers to keep their branches aligned with the default branch through guided, in-product flows, eliminating the need to switch to external tools like GitHub or GitLab.

When conflicts arise, Retool walks developers through a conflict resolution process entirely within the IDE, including validation checks to catch errors before completing the operation.

This change also eliminates the need for catch-up commits.

Branch merging is currently rolling out in public beta on Retool Cloud and will be available on a subsequent edge version of Self-hosted Retool.