Conflict non-resolution

Discussion of open issues, suggestions and bugs regarding file and folder merge tool – Code Compare
Post Reply
Ray128
Posts: 3
Joined: Wed 08 Jul 2020 16:56

Conflict non-resolution

Post by Ray128 » Wed 08 Jul 2020 20:29

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.

ekaterinag
Devart Team
Posts: 23
Joined: Wed 06 Nov 2019 06:48

Re: Conflict non-resolution

Post by ekaterinag » Thu 09 Jul 2020 07:06

Hi! Thank you for your feedback, we'll take it into account in a new version of Code Compare product.

Post Reply