My apologies if this was asked earlier, I was not sure whether to ask this question on the programming forum, since it is more related to the programming environment than to the specific technology, so please accept my (dual) applications, if I am conducting this in the wrong place, my logic in this case was, if it affects the code that I write, then this is the place for him.
At home, I do a lot of my development on Mac Pro, I develop for Mac, iPhone and Windows on this computer (Xcode and Visual Studio - (several versions installed in bootcamp, but usually I run it through parallels)).
When visiting a client, I have a similar setup, but on my MacBook Pro.
What I want is a version control solution for installation on Mac Pro that will support both Xcode and several versions of visual studio, so when I'm on the client, I can just take the latest copy from the original control through MacBook Pro Having visited the client, he can suggest changes, and minor ones that I would like to make on the site, so I need the opportunity to combine any modified code back into the project / solution trunk when I get home.
At the moment I do not use any version control at all and rely on simply copying folders and rewriting them when I return from the client - this is my "merge" !!!
I was wondering if anyone had a source provider idea that I could use that would support the Windows and Mac development environment and cheap (it would be better for free).
source
share