The current flow for updating branches from main file assumes that I will ‘Apply Changes’ after I have resolved conflicts. This is not always the case. In several cases simply getting a a visual overview of what could be affected is what I need to see.
The placement of the Next (Once conflict resolution method has been added) and the following “Apply changes button” is right on top eachother.
Several posts already have mentioned the need to select individually what should be applied even if there is no conflict. This would be a very welcome feature, and would allign with general practise for branching in software development.