Resolve Conflicts, the OK button is ghosted out

This forum is for all Flare issues related to using Source Control.
Post Reply
chrispitude
Propeller Head
Posts: 58
Joined: Thu Mar 23, 2017 12:23 pm

Resolve Conflicts, the OK button is ghosted out

Post by chrispitude »

Hi all,

I stumbled onto a case where the Resolve Conflicts window opens and all the conflicts appear to be resolved already, but the OK button was disabled (ghosted). It turns out that this occurs when there are conflicts in the underlying source code (text editor) that aren't visible in the XML editor.

I've attached an animated GIF to this post showing the resolution. You can see that the conflict was a "Track Changes" annotation in the "<head>..></head>" section of the topic file. Once I arbitrarily chose some merge configuration for that, I was able to click OK and complete the merge!
flare_hidden_conflicts.gif
You do not have the required permissions to view the files attached to this post.
Post Reply