Conflict states are local to you. In this cases it means you attempted to delete something that someone else had modified, so that got marked as a conflict. It should just mean tha the delete didn't actually happen on the server. You'll have to right click the conflicted files and selec svn 'resolved'. Then do an svn update, and if toy need to delete anything from the resulting state do so then committ.
C2C SVN Changelog
- Thread starter Dancing Hoskuld
- Start date
Conflict states are local to you. In this cases it means you attempted to delete something that someone else had modified, so that got marked as a conflict. It should just mean tha the delete didn't actually happen on the server. You'll have to right click the conflicted files and selec svn 'resolved'. Then do an svn update, and if toy need to delete anything from the resulting state do so then committ.
Dancing Hoskuld
Deity
Thanks. Except of course, the conflicted file was not showing up in my directory. However I have figured out how to fix it and will do so.
Hydromancerx
C2C Modder
Updates
- Fixed Martian Barren and gave all Martian terrains terrain damage.
- Fixed Robotics Lab.
- Fixed Martian Barren and gave all Martian terrains terrain damage.
- Fixed Robotics Lab.
Dancing Hoskuld
Deity
Updates
- Fixed conflicts due to me missing the French updates to game text.
- BTW Chimpanzee was added to the animals.
Edit
- Tidy up Resources; remove old versions of art which were moved to core for v25 release.
- Fix PleistocenePark for when one or more mega fauna options have been removed.
- Fixed conflicts due to me missing the French updates to game text.
- BTW Chimpanzee was added to the animals.
Edit
- Tidy up Resources; remove old versions of art which were moved to core for v25 release.
- Fix PleistocenePark for when one or more mega fauna options have been removed.
Hydromancerx
C2C Modder
Updates
- Updated my FPK.
- Added Aircraft and Computers resources.
- Updated my FPK.
- Added Aircraft and Computers resources.
Don't worry, simply upload your files, and I will re-apply my translations on them.
Ah, where exactly is this option located? I couldn't find it
Right click on the C2C SVN folder, choose "Tortoise>Clean Up".
That's the one. I was mis-remembering the name (I wasn't on my computer when I responded the first time)
strategyonly
C2C Supreme Commander
France flag was wrong.
EDIT: Separated FPK's to see if it helps or not
EDIT: Separated FPK's to see if it helps or not
Dancing Hoskuld
Deity
Updates (rev 3390)
- Return to old Druid found movie because new one was causing errors when played.
- New - merged in CivPlayer8's Advanced Civics.
Warning there are some XML errors in the Pirates leaders this does not cause things to fall over and StrategyOnly should be able to fix it soonish.
@Hydro I had to update a couple of your files on the SVN but also included a file of them here so you know exactly what has changed. I also included a couple of fixes for when people turned off mega fauna. (there are still a few problems if they do.)
- Return to old Druid found movie because new one was causing errors when played.
- New - merged in CivPlayer8's Advanced Civics.
Warning there are some XML errors in the Pirates leaders this does not cause things to fall over and StrategyOnly should be able to fix it soonish.
@Hydro I had to update a couple of your files on the SVN but also included a file of them here so you know exactly what has changed. I also included a couple of fixes for when people turned off mega fauna. (there are still a few problems if they do.)
Ah, thanks, works now!
I actually have to do it a lot, between my poor internet service and sourceforge often yo-yoing between 0bytes/second and 300KBytes/second, and then timing out completely.
strategyonly
C2C Supreme Commander
Thx for the heads-up, just changed Bandits to Banditry for Pirates civics.
Also Hydro, there are 4 errors in this area about Diplomat stuff (Science folder)(see attached)
Cant have this: UNITCLASS_DIPLOMAT_VERY_EARLY/INDUS/MODERN if there is NO unit provided also for it????
Where can I download SVNs?
I had a link once, but can't find it now, so is there any DIRECT link there?
Thanks.
EDIT:
I found it.
http://caveman2cosmos.svn.sourceforge.net/viewvc/caveman2cosmos/
Can you put it somewhere accessable?
(Or am I that stupid, and it already IS???)
EDIT:
Never mind.
I'm not sure that I'm gonna use SVN anyways.
I had a link once, but can't find it now, so is there any DIRECT link there?
Thanks.
EDIT:
I found it.
http://caveman2cosmos.svn.sourceforge.net/viewvc/caveman2cosmos/
Can you put it somewhere accessable?
(Or am I that stupid, and it already IS???)
EDIT:
Never mind.
I'm not sure that I'm gonna use SVN anyways.
Nice!
I was asking for that three months ago, it's nice to finally see it in the Core. Also, are we planning on giving CivPlayer8 SVN access to become the civic maintainence guy?
Dancing Hoskuld
Deity
No, that is my fault. I must have removed the basic Extra Diplomacy stuff by mistake. I'll fix it in the morning, it is after midnight here oops 2am I was only playing one more turn
strategyonly
C2C Supreme Commander
I'll fix it in the morning, it is after midnight here oops 2am I was only playing one more turn
ahahaha
Thx i needed that, as always!!Just pushed to SVN (3392):
@DH - go ahead and put up the new TERRAIN_SPACE whenever you wish now.
- Changed from using TERRAIN_SPACE to TERRAIN_NONE for blanking hidden areas on viewport switches
- Fixed caching of free area and free trade-region buildings tag
@DH - go ahead and put up the new TERRAIN_SPACE whenever you wish now.
