Solving conflicts

I am trying to merge a sub branch which has conflicts into my main branch, but in the Solving Conflicts windows in Studio I get text that the program seems to not be able to translate. As I try to select the changes I want saved to the main branch they do not get selected, as in the final window there are no changes to be selected no matter what I have selected previously, so I cannot have the branch merged.

Any help is appreciated, thanks in advance!

1 Like

Hi @markus.pennanen

Welcome to our UiPath Forum! :slight_smile:

It looks like a bug! Could you maybe share with us the project or at least more details (as per this topic)?

The best way to do that would be to submit the bug via our Studio feedback feature, see here:
#FeatureBlog - 19.7 - Send feedback or report bugs directly from Studio

Hi @markus.pennanen

I have since learned that our diff tool does not support Excel .xlsx files, and this would be the reason for the broken output.

This will be documented in our Workflow Diff documentation article :slight_smile:

This topic was automatically closed 3 days after the last reply. New replies are no longer allowed.