How do you resolve merge conflicts?

Help Studio
1

Hello,

How can you resolve a Merge Conflict in UiPath Studio 2020.10.2 line by line? Is that even possible?
How do you solve conflicts where you and your colleague changed the same Workflow file? Any tips or best practices?

Thanks and best regards,
Julia

2

@juliaF

If you can copy entire folder of the workflow which includes project.json, settings files etc.,
the error won’t appear

Hope this helps you

Thanks

3

Hello,

I’m sorry. I don’t really understand what you are meaning… Maybe my questioning wasn’t accurate:
If Developer A changes file.xaml (at the beginning) and Developer B changes file.xaml (at the end) - then I don’t want either Changes A or Changes B, I want both. So is it possible to solve the merge conflicts line by line (as for example IntelliJ can do)?

Thank you for your answer