Resolving SVN conflics

Just downloaded Vega Strike and need help? Have a question but don't know where to start? Ask here.
Post Reply
loki1950a
Star Pilot
Star Pilot
Posts: 4
Joined: Thu Feb 16, 2012 5:27 am

Resolving SVN conflics

Post by loki1950a »

I'm back on line :D but still have problems with my prime account :( I have updated my svn sandbox but I get some svn conflicts in the bin folder this is all under Win7 all of the binaries are not usable should I delete the folder and repull the bin folder.

Enjoy the Choice:)
klauss
Elite
Elite
Posts: 7243
Joined: Mon Apr 18, 2005 2:40 pm
Location: LS87, Buenos Aires, República Argentina

Re: Resolving SVN conflics

Post by klauss »

You can easily get a clean bin folder by "reverting" any file with conflicts.

Reverting drops your file and restores the upstream version.

You can also keep your own version if you mark it "resolved" without further action, though it only works like that on binary files - text files may have conflict tags that need attention.
Oíd mortales, el grito sagrado...
Call me "Menes, lord of Cats"
Wing Commander Universe
loki1950a
Star Pilot
Star Pilot
Posts: 4
Joined: Thu Feb 16, 2012 5:27 am

Re: Resolving SVN conflics

Post by loki1950a »

Thx klauss no more red marks, now to run an export of the whole tree and look at the new eye candy :)

Enjoy the Choice :)
loki1950a
Star Pilot
Star Pilot
Posts: 4
Joined: Thu Feb 16, 2012 5:27 am

Re: Resolving SVN conflics

Post by loki1950a »

Nice 8) like the new extreme shaders and the new sensor display.Runs very smoothly but that maybe because of my rig now Quad Core and Nv 9800gt and running @1920x1080 :D

Enjoy the Choice:)
klauss
Elite
Elite
Posts: 7243
Joined: Mon Apr 18, 2005 2:40 pm
Location: LS87, Buenos Aires, República Argentina

Re: Resolving SVN conflics

Post by klauss »

Careful with the 9800, it tends to burn out.

Make sure to add extra ventilation or run it with an AC-ed room, the built-in cooler isn't enough it seems.
Oíd mortales, el grito sagrado...
Call me "Menes, lord of Cats"
Wing Commander Universe
loki1950a
Star Pilot
Star Pilot
Posts: 4
Joined: Thu Feb 16, 2012 5:27 am

Re: Resolving SVN conflics

Post by loki1950a »

It's in a case with three fans:) and been using it now for over a year.Also got the new Tortoise SVN client 1.7 with the bug fixes upgrading my sandbox ATM.

Enjoy the Choice:)
klauss
Elite
Elite
Posts: 7243
Joined: Mon Apr 18, 2005 2:40 pm
Location: LS87, Buenos Aires, República Argentina

Re: Resolving SVN conflics

Post by klauss »

loki1950a wrote:It's in a case with three fans:) and been using it now for over a year.

Enjoy the Choice:)
Same thing with mine, but that didn't stop it from burning up on a hot day.
Oíd mortales, el grito sagrado...
Call me "Menes, lord of Cats"
Wing Commander Universe
Post Reply