I'm back on line 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:)
Resolving SVN conflics
-
- Elite
- Posts: 7243
- Joined: Mon Apr 18, 2005 2:40 pm
- Location: LS87, Buenos Aires, República Argentina
Re: Resolving SVN conflics
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.
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.
-
- Star Pilot
- Posts: 4
- Joined: Thu Feb 16, 2012 5:27 am
Re: Resolving SVN conflics
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
Enjoy the Choice
-
- Star Pilot
- Posts: 4
- Joined: Thu Feb 16, 2012 5:27 am
Re: Resolving SVN conflics
Nice 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
Enjoy the Choice:)
Enjoy the Choice:)
-
- Elite
- Posts: 7243
- Joined: Mon Apr 18, 2005 2:40 pm
- Location: LS87, Buenos Aires, República Argentina
Re: Resolving SVN conflics
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.
Make sure to add extra ventilation or run it with an AC-ed room, the built-in cooler isn't enough it seems.
-
- Star Pilot
- Posts: 4
- Joined: Thu Feb 16, 2012 5:27 am
Re: Resolving SVN conflics
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:)
Enjoy the Choice:)
-
- Elite
- Posts: 7243
- Joined: Mon Apr 18, 2005 2:40 pm
- Location: LS87, Buenos Aires, República Argentina
Re: Resolving SVN conflics
Same thing with mine, but that didn't stop it from burning up on a hot day.loki1950a wrote:It's in a case with three fans:) and been using it now for over a year.
Enjoy the Choice:)