Rob Allen, Nick Lo, and Steven Brown
"Zend Framework in Action"
Licensed to Menshu You
Zend Framework in Action (Ch01) Manning Publications Co. 8
Figure 10.2 The four variations of the conflicting files after svn update
Taking a look inside bootstrap.php we can see the following conflicting lines:
<<<<<<< .mine
Zend_Controller_Action_HelperBroker::addPrefix('Places_Controller_Action_Helper');
=======
Zend_Controller_Action_HelperBroker::addPrefix('Zend_Controller_Action_Helper_');
>>>>>>> .r1102
Which is roughly the equivalent to the output generated if we were to run the command:
diff bootstrap.php.mine bootstrap.php.r1102
From this we can see that our edit, .mine, removed the underscore from the end of the parameter string
"Places_Controller_Action_Helper" while Rob's edit was to change the start of the parameter name to "Zend_"
instead of "Places_". After a quick discussion with Rob we decide that neither of our changes is needed and we
should revert back to the version before either of our changes. This is a simple fix for which we could either
edit bootstrap.php or copy bootstrap.php.r1100 over bootstrap.php. For the sake of the example let's edit
bootstrap.php to contain only the single line:
Zend_Controller_Action_HelperBroker::addPrefix('Places_Controller_Action_Helper_');
Having done that a quick status check indicates that while we've corrected the file, the svn conflict still
exists:
$ svn status
C application/bootstrap.
Pages:
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291