Another developer and I have been using SVN with construct 2 for some time (over 100 commits) and almost every time we end up with a conflict due to the .caproj file. This usually turns into a huge ordeal and is very painful. Now we have been just not committing it and just committing the .xml's. The problem is that I have all these .xml's for event sheets/layouts from my partners work that I cannot open because my .caproj doesn't recognize them.
Is there a way to manually import event sheets and layouts? Or even better have the .caproj automatically recognize all the .xml's in the Event Sheets and Layouts folder and such. This is a huge problem with using SVN for Construct 2 projects.