I am curious what the 3-way folder merge will look like. Here is my scenario:
I have 2 folder trees that have a common ancestor (we branched our code and applied a different set of changes to each branch). I want merge the two branches back into one common folder. Is this what the 3-way folder merge will do? Will it auto merge any files without conflicts, and bring up a 3-way file merge for any file it encounters with conflicts?
What about files that were renamed in one branch, but not the other? The renamed file would not match the ancestor or the other branch. What would be done in that situation?
If I had an n-way folder compare open, would I be able to:
I have 2 folder trees that have a common ancestor (we branched our code and applied a different set of changes to each branch). I want merge the two branches back into one common folder. Is this what the 3-way folder merge will do? Will it auto merge any files without conflicts, and bring up a 3-way file merge for any file it encounters with conflicts?
What about files that were renamed in one branch, but not the other? The renamed file would not match the ancestor or the other branch. What would be done in that situation?
If I had an n-way folder compare open, would I be able to:
- select a file out of three different folders and launch a 3-way file merge using those files?
- select a subfolder out of three different folders and launch a 3-way folder merge using those folders?
Comment