Help With Source Control with New Merge Beta

Hey all, looking for some advice on how others have handled source control, especially after the branch merging beta that was recently released.

We are looking to bring on a Retool contractor (side note; hmu if you are a US based Retool developer looking for work) and I am trying to figure out the best way to have them work on a source controlled app. They will be the primary editor of this app, but I will also be making changes from time to time. I would want to review all the changes they make and then merge them when ready, however I would want them to immediately begin work on the next set of features.

The changes are likely going to be pretty linear, (eg. they add a table, then they make edits to a table, ect.) so I would want them to immediately begin editing the same app again. For this reason making a new branch of main immediately wouldnt work. It doesnt appear possible to make a branch off a branch within the Retool UI. Can this be done through Github then edited in Retool? Is this a viable solution?

Any advice would be appreciated, especially if you have successfully implemented a similar workflow in the past!

1 Like