You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by Chak <r_...@yahoo.com> on 2005/12/10 12:05:21 UTC
Conflict on a client who does not commit ?
I have found, in 4-5 cases, a conflict on a client who does not even have a userid/password to commit to the repository. I help them remove the wrong block, and retain the right one, since all the users are new to any CMS. However, is this a symptom of some problem in the repository ?
Regards,
Chakravarthy.
---------------------------------
Yahoo! Shopping
Find Great Deals on Holiday Gifts at Yahoo! Shopping
Re: Conflict on a client who does not commit ?
Posted by Phillip Susi <ps...@cfl.rr.com>.
No, it means this user modified the files locally in such a way that
they conflicted with the changes someone else committed to the repository.
Chak wrote:
> I have found, in 4-5 cases, a conflict on a client who does not even have a userid/password to commit to the repository. I help them remove the wrong block, and retain the right one, since all the users are new to any CMS. However, is this a symptom of some problem in the repository ?
>
> Regards,
>
> Chakravarthy.
>
>
>
> ---------------------------------
> Yahoo! Shopping
> Find Great Deals on Holiday Gifts at Yahoo! Shopping
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org