Hi,
I am using TortoiseSVN for subversion. What steps should I follow to upgrade my project to version 14.1 without creating conflicts in SVN?
I upgraded my solution's working copy to version 14.1. and committed to repository. This changed some .csproj files and some other xaml files . On another pc, if I first upgrade to version 14.1. and run an SVN Update it creates conflicts. So, what steps to follow to avoid conflicts?
Thanks.
Hello Jay and thank you for posting!
I have been looking into your scenario and after some research I could suggest you to make sure the server version on the sever is updated to 14.1 as it seems that the Subverion could not work using different major versions: http://subversion.apache.org/faq.html#why. You may aslo double check the content of the license file and remove it so that the correct resourses are referenced. You could also have a look at the following forum thread where similar issue is discussed for TFS and try the approach suggested there: http://ko.infragistics.com/community/forums/p/89535/442346.aspx.
Hello,
I am just checking your progress on the issue.
If you have any other questions on the matter, please feel free to ask.