When the branch is updated by the main branch, there should be an option to keep a copy of the frames having conflicts for later merging.
The current flow is awkward and unnecessarily complex.
If there is a conflict during the update, there is only one simple option to resolve it. I keep my changes or I take over the changes from the main branch and lose my changes.
So the update has to be aborted to first create a copy of the corresponding frames to later merge the change fine-granularly.
This could optionally be done automatically by the update process in case of conflicts.
Maybe I’m approaching this the wrong way.
How do you deal with it?
Here a visual explanation …