I've been doing a lot of 3-way merging these days and have been finding that BC's 3-way merge really isn't providing the function I want. What the merge tool gives me is left vs base and right vs base. But what I'm really looking for is left vs right. The only time I want base involved is if left and right differ. In that case I want to know if there was a change from base to left, base to right, or both.
Currently I find the best way to do this is to open a 2-way compare in one window and a 3-way merge in another window. I do all my work in the compare window and only refer to the merge window if there's a difference in the compare window and I need to refer back to the base file to determine where the change(s) came from. Note that I may be pushing changes to the left AND the right, changing both files being compared.
Maybe I'm wrong but it doesn't seem to me that this is all that uncommon a situation.
Thank you,
Steve
Currently I find the best way to do this is to open a 2-way compare in one window and a 3-way merge in another window. I do all my work in the compare window and only refer to the merge window if there's a difference in the compare window and I need to refer back to the base file to determine where the change(s) came from. Note that I may be pushing changes to the left AND the right, changing both files being compared.
Maybe I'm wrong but it doesn't seem to me that this is all that uncommon a situation.
Thank you,
Steve
Comment