We have TFS 2010 as a source control system. We are trying to do a bulk merge between two branches using TFS. The Detail scenario is as listed below
1. Two branches in question are “A” and “B”
2. We need to merge code from B to A in branch “A”
3. Number of differences between these branches will be in order of 1000 files (mostly file differences and very few new files in branch B)
4. When I do a merge between these branches , the merger results are not as expected.
5. A typical case would be –
a. Let’s say I have a.cs file in both branches
b. a.cs from Branch “A” has contents
1
2
3
4
5
6
7
c. a.cs from branch “B” has contents
1
2
3
4
5
8
9
10
d. and after merge the file of-course does not get merge, asking for a manual merger,
As per my previous experience SVN used to perform smart merging, it will do a resulting file a.cs in branch “A” - as
1
2
3
4
5
>>>> your’s
6
7
>>>>
>>>>their’s
8
9
>>>>
10
And then I can resolve the 2 conflicts manually (I am getting at least 1 merge automatically done)
but TFS is not able to do it, it forces us for a manual merge, some google research made me of opinion that Merging of TFS is not really working. I am looking at option of configuring BeyondCompare tool as Diff and Merge tool in TFS, initial investigations of BeyondCompare also did not show any indication of getting this done automatically, I am looking for doing a line by line smart merge (automatically) as in scope files are in order of 500s. I am really missing the SVN feature.
Some suggestions and pointers would help a lot.
0 comments:
கருத்துரையிடுக