2006-01-09 04:56:19 John's Class Conflict
( bash )
  1  jjb-g4-laptop:~/ibiblio/lyceum/trunk/src/lyceum$ svn merge -r3397:3412 http://svn.automattic.com/wordpress/trunk/
2 U wp-includes/cache.php
3 U wp-includes/template-loader.php
4 U wp-includes/functions-compat.php
5 U wp-includes/functions-post.php
6 C wp-includes/classes.php
7 U wp-includes/functions.php
8 U wp-content/themes/default/functions.php
9 U wp-content/themes/default/images/header-img.php
10 U wp-settings.php
11 U wp-admin/inline-uploading.php
12 U wp-admin/profile.php
13 U wp-admin/index.php
14 U wp-admin/import/livejournal.php
15 jjb-g4-laptop:~/ibiblio/lyceum/trunk/src/lyceum$
  • Jeff (Mon, January 9th, 2006, 5:05am UTC)
    But then comes the good news:
    ( bash )
      1  jjb-g4-laptop:~/ibiblio/lyceum/trunk/src/lyceum$ svn resolved wp-includes/classes.php
    2 Resolved conflicted state of 'wp-includes/classes.php'

    Good John.

Leave a comment