Re: Question regarding merging branches

"Dylan Cuthbert" <dylan@q-games.com> writes:
> I understand that no data gets lost, but when merging a branch with, say,
> 100 files or more, all of which have committed changes, some conflicting,
> some not, I end up with no idea what's been merged and what hasn't. This
> seems very error-prone.
>
> Or maybe there's some subtlety that I'm missing again. :-)

No, there's no subtlety, this is just the way Subversion (and CVS)
resolves conflicts. It tells the user there is a conflict, gives them
all the information they need to resolve the conflict (including the
unmerged versions of both the working file and the repository file),
and then assumes that the user will take care of the situation.

You may initially have "no idea what's been merged and what hasn't",
but judicious use of the `diff' program will change that...

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Sep 10 03:59:56 2002