Updated svn today and lots of conflicts with export trait files in many factions so i deleted them and then updated them and all is restored now, is that what i should of done?
SVN conflicts
Updated svn today and lots of conflicts with export trait files in many factions so i deleted them and then updated them and all is restored now, is that what i should of done?
Consummatum est
Re: SVN conflicts
Exactly!
Creator of: "Ecce, Roma Surrectum....Behold, Rome Arises!"
R.I.P. My Beloved Father
Praepositus
Re: SVN conflicts
How did you know what to delete?
DVK is there another update now?
Or the same one we had a few days ago.
Also still no changes in the released mod.
Roma Surrectum Greek/Spartan Researcher/Tester.
Re: SVN conflicts
I knew what to delete because the files said conflicted, so if you delete the old file (which is conflicted) then do svn it will put the new one in place, basically it wont overwrite the file for some reason i think im right in saying that. You can check your svn log, or just leave up the svn update window and just delete the files in the locations which svn tells you havent worked.
Praepositus
Re: SVN conflicts
Thank you, you learn something new every day!
Roma Surrectum Greek/Spartan Researcher/Tester.
Consummatum est
Re: SVN conflicts
No changes to SVN yet.
Creator of: "Ecce, Roma Surrectum....Behold, Rome Arises!"
R.I.P. My Beloved Father
Praepositus
Re: SVN conflicts
K , great. It's working great svn beta 2.
Roma Surrectum Greek/Spartan Researcher/Tester.
Posting Permissions
Reply With Quote
