Studio + GIT integration : Conflict resolution

[SorenB]

Hello @Shrini_Kulkarni

I had a similar problem with an unsolvable conflict, perhaps this is the same problem.
I found a solution in my case so maybe take a look below.

Bug: unsolvable conflict

Hello I am merging my main branch into my feature branch under development to catch up on changes. During this stage I am asked to solve conflicts which normally works just fine. However a recent conflict presented in UiPath Studio seems to be unsolvable. The changes has been registrered on the file but there are no visible changes shown and the Save button is not clickable. So I am unable to proceed in my conflich solving process. It does’nt help changing left/right side. [image] If I …

Regards
Soren