3-way merge is a welcome feature ... can't wait for a 3-way directory merge feature.
I have used Araxis Merge and Guiffy as well and they depend on a "common ancestor", which in the case of Araxis is shown in the middle.
BC3 help does not give advice on which file should be which and I have two questions:
1. For each column (left, center, right) which file is recommended (trunk, common ancestor, branch aka mine, common ancestor, yours)?
2. When using Windows Explorer context menu what order should the three files be selected to put them in to the proper columns as defined in question 1?
I have used Araxis Merge and Guiffy as well and they depend on a "common ancestor", which in the case of Araxis is shown in the middle.
BC3 help does not give advice on which file should be which and I have two questions:
1. For each column (left, center, right) which file is recommended (trunk, common ancestor, branch aka mine, common ancestor, yours)?
2. When using Windows Explorer context menu what order should the three files be selected to put them in to the proper columns as defined in question 1?
Comment