Commit Issues

I am trying to commit my application, requiring me to update, but a message appears saying I can not update due to conflicts.  This message reads out my application ending in "main/Javasource/health"  When looking at my changes tab there are no conflict indicators appearing.  
1 answers

Hi Nathan,

Unfortunatelly, you are having a conflict in a part of the poject that is not handled by the Modeler.
You have to "manually" resolve the conflict using a SVN tool like svn tortoise

Install the tool and make sure to keep the explorer context menu check box checked, and then you should be able to resolve conflicts by right clicking inside your project (in the windows explorer) and clicking on svn tortoise -> resolve conflict. If you get stuck try googling, you can find a lot of information online regarding tortoise and svn as they are heavily used.


Hope this helps,