Getting conflict when merging with the Main branch line that doesnt show in the Error tab

0
After the merge I get the following     The file data-snapshot.zip doesn’t exist in directory.   And this is what I get if I try to ignore and commit the merge I get      
asked
3 answers
0

Assuming you are still on SVN. Try to fix the confict via Tortoise svn. This is an external tool that can help you solve conflict outside Mendix Studio Pro.

answered
0

Hi Khaled,

You can use TortoiseSVN to resolve file conflicts as described here: https://docs.mendix.com/refguide/using-version-control-in-studio-pro#9-working-outside-studio-pro

answered
0

Maybe try to make a snapshot this way in both branches first?

 

answered