Context of the problem/Issue:
-
When merge conflict window opens - it shows two versions of the code - left side (incoming or source branch - UiPath calls it as “remote”) and right side ("target branch - currently checked branch - UiPath calls it as local).
-
By default - UiPath merge utility assumes right side (local) is “correct” and selects it by default.
-
There are two buttons on the top “Choose Left” (enabled by default) and “Choose Right” (disabled). Clicking any of these available (enabled) buttons - expected to do two things
-
Toggle to another button (disabled one and make it enabled)
-
Considers “that” side (left or right) is "right code - “Applies” the decision and marks the conflict as resolved.
-
-
There are two other buttons “next” and “previous” that lets user move through conflicts. It is assumed that when window opens - first conflict is on focus (there is no pointer of GUI cue for this)
Now the issue:
-
When window opens - default focus is on first conflict (there is no pointer or prominent visual cue except a thin highlight around the code block)
-
Clicking "Choose left or choose light) is supposed to apply the decision that the version of specific side is the “correct” version. By this action - the first conflict should be “resolved” and “invisible” pointer should move to next conflict in the file.
-
That is not happening. So, conflict is not resolved - ever.
-
A related problem - here - I am assuming that I want to keep “left version” so I click “choose” left button. What if I wanted to keep the right-side version? How do I make the “choose right” button enabled? By clicking “choose left” button (ironically). But if clicking “choose left” were to work as expected - left side version would be applied as correct and I will not get to select right version at all?