I agree.
But there is no such things as a trivial filemerge. You can never trust an
automatic merge. (Sorry for repeating myself, but I really do think that that is
important.)
(Merges between parents who touches distinct sets of files are "more trivial".
In some cases the "trivial" merge will be wrong in this case too, but I do think
that it makes sense to make a pragmatic distinction between these two cases. The
nontrivial merges I focus on happens to be exactly the ones where it makes sense
to use a merge tool to merge and review.) |