[Vtigercrm-developers] vtiger CRM 5.0.1 Released

[Joe Bordes]

These are the files:

foo.php
svn puts marks in this files with the conflicting lines so you can run
through and try to fix it manually.

foo.php.working
this is the original file "as was" right before merge

foo.php.left
is the svn release version we are moving from, the first number in the
-r parameter, 9535 in the example

foo.php.right
is the svn release version we are moving to, the second number in the -r
parameter, 9621 in the example

The idea is to give you all you need to do the merge manually. Once you
have fixed it you should execute

svn resolved {path/filename}

And svn will eliminate the superflous files and mark the conflict
resolved.

BTW, all this is in the subversion manual ;-)

Joe.

El mar, 10-10-2006 a las 14:56 -0400, Dennis Grant escribió:
> > Now you have to go over the list that svn gave you and check all the
> > lines that start with "C", these are the files svn could not update
> > (conflict), so you have to fix the by hand.
> 
> OK, got this far; got a couple of "C"s.
> 
> Looks like svn made 4 copies of each C-ed file; a bare copy (foo.php) a
> working copy (foo.working.php) a "left" copy (foo.version.left.php) and
> a "right" copy (foo.version.right.php)
> 
> Which is which? 
> 
> DG
> 
> _______________________________________________
> Reach hundreds of potential candidates - http://jobs.vtiger.com