Re: SVN Merge !!

HI, My query is say tow users downloaded the same file.Let's say user A and B.Now A updates the file a.sh and commits to the repository.Now when B makes changes to a.sh and does commit he gets error about his file being out-of-date,now if B wants his changes to be merged with that of A on the repository how can that be done.what if i don't want to do an svn update because i am assuming that the copy that i have with me is the latest one and based on that assumption i have now modified the file.In this scenario if i do svn update whole of my work is lost and i need to modify the a.sh file again.So is there a method by which i can achieve this and if yes how can that be done.I tried svn merge but couldn't get the right syntax. regards Himanshu Raina ----- Original Message ---- From: Janine Sisk <janine_at_furfly.net> To: Subversion List <users_at_subversion.tigris.org> Cc: Himanshu Raina <raina_himanshu_at_yahoo.com> Sent: Saturday, February 3, 2007 12:33:57 AM Subject: Re: SVN Merge !! On Feb 2, 2007, at 3:55 AM, Andy Levy wrote: > 1) After A commits, B just runs svn update. If they had changes that > conflict, Subversion flags these and leaves it to the user to resolve. > If they don't have changes that conflict, the A's changes are merged > into B's version. And if B tries to commit without doing the update, because he doesn't know about A's change, svn will stop the commit and tell him that the file is not up to date. So he will be told that he needs to do it. janine --------------------------------------------------------------------- To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org For additional commands, e-mail: users-help_at_subversion.tigris.org ____________________________________________________________________________________ Expecting? Get great news right away with email Auto-Check. Try the Yahoo! Mail Beta. http://advision.webevents.yahoo.com/mailbeta/newmail_tools.html
Received on Mon Feb 5 12:00:56 2007