Studio + GIT integration : Conflict resolution

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.

Regards
Soren