We worked on the resolving conflicts modal, that allows users to select the change that they want to retain in their main branch.

Thanks for watching

Check out these features here: Start Building

Follow us on Twitter, flutterflow.io