Question

Conflicts exist on disk

1

Hi I want to commit my changes on the teamserver but I keep on getting an error "Conflicts exist on disk" and when I check my changes the conflict is not specified there. how do I fix this?

asked 2012-04-10

Pheko Modiselle

1 answers

Sebastiaan van den Broek · Answer 1 · 2012-04-10

You could use an external svn tool such as TortoiseSVN. Make sure you download version 1.6, that is the version of SVN that Mendix 3.2.1. works with. Then you could see and solve the conflict.