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!
Resolve Conflicts, the OK button is ghosted out
-
- Propeller Head
- Posts: 58
- Joined: Thu Mar 23, 2017 12:23 pm
Resolve Conflicts, the OK button is ghosted out
You do not have the required permissions to view the files attached to this post.