Where I work, we have been using Subversion for many years (apparently I have not been here for so long). There are people who would prefer to use TFS, some of whom would prefer to switch to Mercurial and some who would prefer to maintain the status quo. Other version control elements (Git, others) will not fly due to poor integration of Visual Studio.
The biggest problem / fear that the new source control will weaken is the fear of branching / merging .
I would like to build a test that is directly addressed, which source control is best combined with two branches. Given that there is probably no “demo” version of TFS, this can be tricky. However, this seems like an interesting problem.
To verify this, I need to know the following:
- What is a merge algorithm that is generally bad?
- Can I find information about which merge algorithm is used by the version control system (in particular, TFS)?
- Can I come up with any advantages that could be used to merge Algo over another?
- What types of files do most VCS work with?
More importantly, do you know someone who has already done this?
source
share