I recently merged branches and manually resolved all the conflicts in the project using the mendix modeler. However, I'm unable to make a commit owing to an SVN error. Can someone post instructions (or a link) about how to resolve any conflicts manually?
Download and install TortoiseSVN (if not already installed)
Navigate to your Mendix app directory.
Use the context menu in the directory to show the TortoiseSVN options.
Select the option resolved
Verify the actions in the show dialog and press ok to proceed.