Hello community, What do you do to avoid/resolve merge conflicts? 1. Duplicated pages/microflows due to the new user role. (the option available is resolve conflict using my entire document and that's not what I want). 2. Microflows that were deleted in dev but persist in main after the merge Thank you
Did you use the interactive merge? Because that gives you fine details on who did what and will already mark changes without a conflict as solved. With this option you can merge all the changes and for each conflicted part choose which side needs to win.