Re: Question regarding merging branches

"Dylan Cuthbert" <dylan@q-games.com> writes:
> Well, no, I don't get the conflict messages, I just get the U or the G
> letter when I issue the merge command and the conflicting area is left the
> same as the trunk version (because there are no local mods). I'd prefer to
> have a C, and the culprit lines highlighted "cvs-style", preventing me being
> able to commit until I resolve the problem. This behaviour isn't happening
> in the current version. It merges all the changes from the branch into the
> trunk that don't have conflicts, all conflicts are left as whatever the
> trunk version is.

If there is a conflict, you do get a 'C', and the conflicting areas
are highlighted CVS-style.

If this is not happening for you, it's a bug, and it would be great if
you could give a precise reproduction recipe (see the guidelines in
the HACKING file).

Thanks,
-Karl

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Sep 10 04:13:42 2002