Thank You Javier,
You are right, I think I forgot --> "Mark conflicts solved" step after
merge.
I did not try it now but I will try it and let you know.
have a good one.
/Kiran
On 10/24/07, Javier Kohen <jkohen@users.sourceforge.net> wrote:
>
>
> El mié, 24-10-2007 a las 09:34 -0400, Kiran Karnati escribió:
> > Hi,
> >
> > if the same class is checked out by two users and they both modify it
> > and one of them check it in before, the second one can't overwrite
> > it.
> >
> > He must update it before he can commit. That is a good feature which
> > forces to download all changes made to repos, but even after merging
> > all changes to the local copy and having local changes extra, he
> > still ned to do update to be able to have commit option activated.
>
> Update does not imply "update and override." The former does not
> overwrite the local changes, the latter does. You might be missing the
> "Mark conflicts solved" step after merge.
>
> > This means , the second user loses all his changes he made to the local
> copy once he updates it.
> >
> > Is there any solution for this problem ?
>
> You shouldn't be having this problem. That's one of the main reasons to
> use a revision control system with merge support such as Subversion.
> Review your procedure.
>
> --
> Javier Kohen <jkohen@users.sourceforge.net>
> ICQ: blashyrkh #2361802
> Jabber: jkohen@jabber.org
>
>
>
Received on Wed Oct 24 16:49:07 2007