How to resolve rebase error in Workshop when using Foundry Branching?

[VincentF]

I have a workshop that is on the main branch. I created a new branch to develop a few features.
Usually, I can merge this to main without issues. If there are conflict, I can rebase/resolve the conflict with the merge-conflict editor.
However, what should I do if a merge-conflict leads to an unexpected result ?

For example, if a widget is duplicated or is dropped when I wouldn’t it to be dropped, what should I do ? What is Main had new work directly conflicting with what is on my branch ? Can I avoid to redo the work on a new branch ?

[VincentF]

This might not work for all cases, but cutting and pasting the affected widgets, from the branch to the branch, or from master to the branch, might help.

To do a cut-and-paste, you can select the widget and click “remove widget from layout” on the top right of the screen. Upon adding a new widget you can then navigate to the “unused widget” tab and select the widget you just removed (it was staged in this area, not fully deleted).

Alternatively, you can copy-paste the widget, and use a copy of the widget instead of the original one. You can do this by selecting the widget and CTRL+C/CTRL+V. Same principle, the widget will be available in the “unused widget”.

The same would apply in case a section is affected.

Step by step process, when and if you hit a rebase conflict:

1. copy the widgets affected or the section of the widgets affected or the parent section of the section affected with a conflict
2. go in rebase mode
3. Delete all the sections/widgets where the conflict happens
4. Paste (from 1.) the copy into the now-empty section.
5. [optional] you might need to reconfigure the display of the pasted widget or the conserved parent section, to look the way you want.