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

Re: merging problem

From: Andrew Sasak <andrew.sasak_at_gmail.com>
Date: 2007-11-22 23:38:04 CET

It sounds like your getting errors indicating an update is necessary, which
can be expected when multiple people are working on the same files. This is
also probably independent of the fact that you're using a branch and merging
code; the same could occur on the trunk. If my assumptions are correct, the
errors just say that you need to update before committing (something that
isn't always required), also when you do do this update, if the sames lines
of code are edited by multiple people, the client may indicate the presence
of conflicts, which will need to be resolved. This is all normal.

On Nov 22, 2007 1:59 PM, pinky goyal <pinks.forums@gmail.com> wrote:

> Hi All!
> I need help regarding the merge.
> when i merge my changes into the branch and after that when i try to
> commit the changes i get errors.
> if 2-3 people are working on same branch.they all are working on
> simultaneously. before committing the changes, merging should be done
> or update should be done . ???
> if anyone can help me out what is the right procedure to work on a
> single branch with multiple users.?
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Nov 22 23:38:26 2007

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.