[Vtigercrm-developers] vtiger CRM 5.0.1 Released

Dennis Grant dgrant at accuratetechnologies.com
Tue Oct 10 11:56:48 PDT 2006


> 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




More information about the vtigercrm-developers mailing list