This situation is caused by a bug in the Modeler that exists in 7.19 and up. When merging a branch, the Modeler tries to automatically fix conflicts on the "svn:ignore" property. That property is where Subversion keeps track of files that should be ignored, i.e. on disk but not committed to the Team Server.
If there is both a change on the branch and on the main line in that property, the Modeler resolves the conflicts by simply combining both lists. However, we made the mistake of using Windows newlines instead of UNIX newlines and the Subversion server does not like this.
We will fix this bug in 7.23.0 and fortunately, there is a workaround that does not require upgrading. When you are in the state where you cannot commit the results of a merge, perform the following steps:
* Open the project folder via the Desktop Modeler by choosing "Show project directory in Explorer" from the project menu
* Right-click the white background of the project folder
* TortoiseSVN > Properties
* Double-click the "svn:ignore" line
* Copy all text by doing Ctrl+A, Ctrl+C
* Paste into a new document in Visual Studio Code (or another editor that understands newline conventions)
* In the bottom right, click on "CRLF" and select "LF" instead
* Copy all text by doing Ctrl+A, Ctrl+C
* Go back to window showing the "svn:ignore" property
* Paste there: Ctrl+A, Ctrl+V
* Click "OK"
* Click "OK"
You can commit again, from the Desktop Modeler!
Update: I’ve written down everything about this and related issues in a forum post. See https://forum.mendix.com/link/questions/92813
If something like this happens I recommend to have a look at the project status in TortoiseSVN. If I recall correctly, then version 1.7.15 is the recommended working version.
https://sourceforge.net/projects/tortoisesvn/files/1.7.15/
hope this helps!
Received the following response from Mendix on the issue:
Seems to work.