[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Reason for conflict?

From: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2005-06-09 22:22:36 CEST

On Jun 9, 2005, at 11:46 AM, David Summers wrote:

>
>
> Any ideas?
>

Not unless you show us specific commands and results. We need details.

For example, what exact command are you running to merge the branch
back to the trunk?

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Jun 9 22:26:14 2005

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.