Code Merging Tools...

Question

1.00/5 (1 vote)

See more:

Hi Me and a buddy of mine have just opened a small IT Software Company, and we are using Microsoft MVC, visual Studio and Management Studio

Now we are using 2 machines to develop and we developing the same app, what tool can we use to save our code in the same project but using different machine without over writing the other one s code, just like in the coparate Firm

Where we have multiple developers working on the same app on their local machine but wen they commit that code to the server it merges they code and doesnt over writes the other developers s work

Posted 29-Aug-13 0:21am

Morore_Charles_007

Add a Solution

2 solutions

Add a Solution

Add your solution here

Treat my content as plain text, not as HTML

Preview 0

…

Existing Members

Sign in to your account

...or Join us

Download, Vote, Comment, Publish.

Your Email
Password
Forgot your password?

Your Email
This email is in use. Do you need your password?
Optional Password

I have read and agree to the Terms of Service and Privacy Policy
Please subscribe me to the CodeProject newsletters

When answering a question please:

Read the question carefully.
Understand that English isn't everyone's first language so be lenient of bad spelling and grammar.
If a question is poorly phrased then either ask for clarification, ignore it, or edit the question and fix the problem. Insults are not welcome.
Don't tell someone to read the manual. Chances are they have and don't get it. Provide an answer or move on to the next question.

Let's work to help developers, not make them feel stupid.

This content, along with any associated source code and files, is licensed under The Code Project Open License (CPOL)

_Flaviu · Answer 1 · 2013-08-29T00:36:00

Solution 2

Is really good this[^] one !

Posted 29-Aug-13 0:36am

_Flaviu

Bala Selvanayagam · Answer 2 · 2013-08-29T02:19:00

I would suggest to use https://bitbucket.org[^] as this is a git based anda sort of industry standard.

Bitbucket is integrated with https://appharbor.com/pricing[^] which is free for one user to host MVC applications and this could be used as a testing environment for you (Still, Please check the AppHarbour terms and conditions before you start to use)

Bitbucket easily integrate with visual studio 2012