If I've missed a thread or blog on this, please point me to it.
The help file currently uses the term Text Merge to describe what I think is a 3-way merge. Perhaps they are one in the same except that sometimes there's a center pane.
A 3-way merge can only be invoked via the command line or supported CM Tool?
The Compare In New View Using/Text Merge is something that I'll use more often now that I've found it. Kind of wish it were easier to get to but not sure that I want to have the option of making it the default when I hit enter from a folder view. Take Left then Right is just what I've needed for years. As for Take Center, what does that mean in the Text Merge context? Since there is no center pane, it seems to just wipe out the selection.
Once I take what I want from the left and right into the Output pane, I wish it were easier to save that edit into either the left or right file, replacing it. In my case the right file is usually the one checked out that others have been working on since my last snapshot. So I need to merge those changes with mine into a third file that I'll turn around and check in.
The help file currently uses the term Text Merge to describe what I think is a 3-way merge. Perhaps they are one in the same except that sometimes there's a center pane.
A 3-way merge can only be invoked via the command line or supported CM Tool?
The Compare In New View Using/Text Merge is something that I'll use more often now that I've found it. Kind of wish it were easier to get to but not sure that I want to have the option of making it the default when I hit enter from a folder view. Take Left then Right is just what I've needed for years. As for Take Center, what does that mean in the Text Merge context? Since there is no center pane, it seems to just wipe out the selection.
Once I take what I want from the left and right into the Output pane, I wish it were easier to save that edit into either the left or right file, replacing it. In my case the right file is usually the one checked out that others have been working on since my last snapshot. So I need to merge those changes with mine into a third file that I'll turn around and check in.
Comment