PrestoSoft Community

Hi there,
Just tried the 3-way merge for the first time with mine/theirs/base. It works OK, but I was immediately confused because it highlights the "difference" in all 3 files - even if it's unchanged in one.

So without manually comparing the text, I can't tell that it's telling me: the left hand file has this change from the base, but the right hand file has no change from the base.

To me this makes the merge much harder than it needs to be...

I also noticed:
- it's not very obvious which block has been selected. The little blue dot is too small to be noticeable.
- selecting the right files was tedious. I normally work starting from a folder difference; from this position there is no convenient way to launch the merge.

Maybe I'm missing something, but my first reaction is that it won't help me much.

Been using EDPro for years now.

It works OK, but I was immediately confused because it highlights the "difference" in all 3 files - even if it's unchanged in one.
So without manually comparing the text, I can't tell that it's telling me: the left hand file has this change from the base, but the right hand file has no change from the base.
To me this makes the merge much harder than it needs to be...

I don't see any other way to show three differences aligned. If both their and your file have the same difference compared with the base, it's called matching (has its own color), and you can see that in the diff combo bar and in the tooltips on the diff bars. If only one side differs from the base (and the other side), it's marked as unmatched.

If you were referring to something different, please post a screenshot.

- it's not very obvious which block has been selected. The little blue dot is too small to be noticeable.

I'm not sure which blue dor you are referring to. A selected block is marked as yellow on the diff bars.

- selecting the right files was tedious. I normally work starting from a folder difference; from this position there is no convenient way to launch the merge.

Since directory comparison is based on two directories, not three, I don't see how one could launch 3-way diff from there. Besides, the latter is typically started from a version control system via command line.