php
Since we've decided that out of the four variations bootstrap.php is now the file we want to use we need to
tell subversion that the issue has been resolved and which file to go with:
$ svn resolved application/bootstrap.php
Resolved conflicted state of 'application/bootstrap.php'
Having done that another svn status check indicates that the file is now marked as modified
$ svn status
M application/bootstrap.php
The other three files have also been removed as part of the resolve process, leaving only the bootstrap.php
file
$ ls
bootstrap.php config.ini controllers views
classes configuration models
The final step is to commit the changes back to the repository together with a message noting the
resolution:
$ svn commit -m "Resolved change conflict with bootstrap.php"
Sending application/bootstrap.php
Transmitting file data .
Committed revision 6.
Licensed to Menshu You
Zend Framework in Action (Ch01) Manning Publications Co. 9
Having given an overview of some of the common day-to-day tasks while using subversion there remain a
few topics that are worthy of a mention.
Getting a clean copy from the repository
Subversion stores its information in its own .svn directories inside each directory in the repository. Those .
Pages:
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292