Devart Forums

When resolving conflict from a merge, the program seems to only clear the conflict if I pick one side and make no other changes, if instead I modify the result, there does not appear to way to 'clear' the differences marked as conflicted. It is just weird as other merge editors I have used handle conflict resolution much more cleanly, but with this I can 'resolve' a conflict yet the program still acts like there is a conflict so I have to keep track of my progress more carefully.

I figured out that it is only enabled when syntax highlighting is enabled.

I had syntax highlight disabled since it does not give me control over the colors, but guess I have to have it on if I want to comment things out easily.

in the standalone app, the comment line and uncomment line buttons are dimmed out/disabled, also the hotkeys for them do not work.

Any idea why?