Code: Select all
The drawing about describes my situation.
I have a development path that end in T.
I have a ‘release’ path which has previously been merged into the development path (A has been synchronized with TA).
I now want to merge the development from A to B into T.
I.e., it is a 3-way merge between T and B with the common ancestor A (notice that the path from A to T becomes longer and longer, and is a good deal longer than the A to B path).
It is very important for me to be able to see the two diff’s clearly.
Especially the diff between A and B.
Currently I make a folder diff between A and B and keep that besides the merge so I can switch to that and see the changes I’m really trying to merge into T.
Unfortunately the 3-way-merge view doesn’t make that too clear.
I suggest that you have a way of viewing the diff(A,B) in the 3-way-merge view (and of course also the diff(A,T) it is after all a symmetric operation even if it is typically used in non-symmetric contexts.
It would be nice both to be able to see the diff directly by using a ‘better color scheme’ or to switch to a 2-way-diff view.
Currently unfortunately this kind of merge is very difficult.
Change between horizontal and vertical layout
It would be nice if the diff view could change between horizontal and vertical layout.
When you have just moderately long lines it is cumbersome to have to scroll and it is difficult to spot difference on a line.
Being able to split a edit group
Sometimes the merge tool get the edit groups (lines that are thought of as being edited as a whole) wrong.
In these cases it would be nice to be able to split the groups into lines and then pick between the lines from the two endpoints. (only some of the lines from B should be copied to T).
DiffMerge is a good tool, the best we have been able to find.
Nevertheless merging is rather difficult and time consuming and we would like it to be easier.
If you have any questions about my suggestions don’t hesitate to ask.