CodeIgniter 2.1.0 ブランチの取り込み

ci-ja リポジトリに CodeIgniter の release/2.1.0 ブランチを取り込んだ時のメモです。

upstream を fetch します。

$ git fetch upstream
remote: Counting objects: 1383, done.
remote: Compressing objects: 100% (314/314), done.
remote: Total 876 (delta 696), reused 734 (delta 558)
Receiving objects: 100% (876/876), 203.12 KiB | 175 KiB/s, done.
Resolving deltas: 100% (696/696), completed with 295 local objects.
From github.com:EllisLab/CodeIgniter
   10266cc..308692d  develop    -> upstream/develop
   84a15a6..3a63dd9  hmvc-lite  -> upstream/hmvc-lite
 * [new branch]      release/2.1.0 -> upstream/release/2.1.0

本家の分岐ポイントだと日本語版の作成が終わっていないので、ここでは master から分岐することにします。

$ git checkout master
$ git checkout -b release/2.1.0
Switched to a new branch 'release/2.1.0'

upstream の release/2.1.0 ブランチをマージします。

$ git merge remotes/upstream/release/2.1.0
$ git status
# On branch release/2.1.0
# Changes to be committed:
#
#	new file:   .gitignore
#	new file:   application/config/migration.php
#	modified:   application/config/mimes.php
#	modified:   system/core/Benchmark.php
#	modified:   system/core/Exceptions.php
#	modified:   system/core/Lang.php
#	modified:   system/core/Model.php
#	modified:   system/database/DB_active_rec.php
#	renamed:    system/database/drivers/mysql/mysql_driver.php -> system/database/drivers/cubrid/cubrid_driver.php
#	new file:   system/database/drivers/cubrid/cubrid_forge.php
#	new file:   system/database/drivers/cubrid/cubrid_result.php
#	new file:   system/database/drivers/cubrid/cubrid_utility.php
#	renamed:    system/cache/index.html -> system/database/drivers/cubrid/index.html
#	renamed:    system/database/drivers/odbc/odbc_driver.php -> system/database/drivers/pdo/pdo_driver.php
#	modified:   system/helpers/string_helper.php
#	modified:   system/language/english/form_validation_lang.php
#	new file:   system/language/english/migration_lang.php
#	modified:   system/libraries/Driver.php
#	new file:   system/libraries/Migration.php
#	modified:   user_guide/helpers/url_helper.html
#	modified:   user_guide/images/appflowchart.gif
#	new file:   user_guide/libraries/migration.html
#	renamed:    user_guide/installation/upgrade_202.html -> user_guide/tutorial/conclusion.html
#	new file:   user_guide/tutorial/create_news_items.html
#	new file:   user_guide/tutorial/hard_coded_pages.html
#	new file:   user_guide/tutorial/news_section.html
#	new file:   user_guide/tutorial/static_pages.html
#
# Unmerged paths:
#   (use "git add/rm <file>..." as appropriate to mark resolution)
#
#	deleted by them:    .hgignore
#	both modified:      application/config/config.php
#	both modified:      application/config/database.php
#	both modified:      application/views/welcome_message.php
#	both modified:      system/core/CodeIgniter.php
#	both modified:      system/core/Config.php
#	both modified:      system/core/Controller.php
#	both modified:      system/core/Hooks.php
#	both modified:      system/core/Input.php
#	both modified:      system/core/Loader.php
#	both modified:      system/core/Output.php
#	both modified:      system/core/Router.php
#	both modified:      system/core/Security.php
#	both modified:      system/core/URI.php
#	both modified:      system/database/DB.php
#	both modified:      system/database/DB_cache.php
#	both modified:      system/database/DB_driver.php
#	both modified:      system/database/DB_forge.php
#	both modified:      system/database/DB_result.php
#	both modified:      system/database/DB_utility.php
#	both modified:      system/database/drivers/mysql/mysql_utility.php
#	both modified:      system/database/drivers/mysqli/mysqli_driver.php
#	both modified:      system/database/drivers/oci8/oci8_driver.php
#	both modified:      system/database/drivers/oci8/oci8_result.php
#	added by them:      system/database/drivers/sqlsrv/index.html
#	both modified:      system/helpers/form_helper.php
#	added by us:        system/language/japanese/index.html
#	both added:         system/libraries/Cache/drivers/Cache_apc.php
#	both added:         system/libraries/Cache/drivers/Cache_memcached.php
#	both modified:      system/libraries/Cart.php
#	both modified:      system/libraries/Email.php
#	both modified:      system/libraries/Form_validation.php
#	both modified:      system/libraries/Upload.php
#	both modified:      system/libraries/User_agent.php
#	both modified:      user_guide/changelog.html
#	both modified:      user_guide/database/active_record.html
#	both modified:      user_guide/database/caching.html
#	both modified:      user_guide/database/call_function.html
#	both modified:      user_guide/database/configuration.html
#	both modified:      user_guide/database/connecting.html
#	both modified:      user_guide/database/examples.html
#	both modified:      user_guide/database/fields.html
#	both modified:      user_guide/database/forge.html
#	both modified:      user_guide/database/helpers.html
#	both modified:      user_guide/database/index.html
#	both modified:      user_guide/database/queries.html
#	both modified:      user_guide/database/results.html
#	both modified:      user_guide/database/table_data.html
#	both modified:      user_guide/database/transactions.html
#	both modified:      user_guide/database/utilities.html
#	both modified:      user_guide/doc_style/index.html
#	both modified:      user_guide/general/alternative_php.html
#	both modified:      user_guide/general/ancillary_classes.html
#	both modified:      user_guide/general/autoloader.html
#	both modified:      user_guide/general/caching.html
#	both added:         user_guide/general/cli.html
#	both modified:      user_guide/general/common_functions.html
#	both modified:      user_guide/general/controllers.html
#	both modified:      user_guide/general/core_classes.html
#	both modified:      user_guide/general/creating_drivers.html
#	both modified:      user_guide/general/creating_libraries.html
#	both modified:      user_guide/general/credits.html
#	both modified:      user_guide/general/drivers.html
#	both added:         user_guide/general/environments.html
#	both modified:      user_guide/general/errors.html
#	both modified:      user_guide/general/helpers.html
#	both modified:      user_guide/general/hooks.html
#	both modified:      user_guide/general/libraries.html
#	both modified:      user_guide/general/managing_apps.html
#	both modified:      user_guide/general/models.html
#	both modified:      user_guide/general/profiling.html
#	both modified:      user_guide/general/quick_reference.html
#	both modified:      user_guide/general/requirements.html
#	both modified:      user_guide/general/reserved_names.html
#	both modified:      user_guide/general/routing.html
#	both modified:      user_guide/general/security.html
#	both modified:      user_guide/general/styleguide.html
#	both modified:      user_guide/general/urls.html
#	both modified:      user_guide/general/views.html
#	both modified:      user_guide/helpers/array_helper.html
#	both modified:      user_guide/helpers/captcha_helper.html
#	both deleted:       user_guide/helpers/compatibility_helper.html
#	both modified:      user_guide/helpers/cookie_helper.html
#	both modified:      user_guide/helpers/date_helper.html
#	both modified:      user_guide/helpers/directory_helper.html
#	both modified:      user_guide/helpers/download_helper.html
#	both modified:      user_guide/helpers/email_helper.html
#	both modified:      user_guide/helpers/file_helper.html
#	both modified:      user_guide/helpers/form_helper.html
#	both modified:      user_guide/helpers/html_helper.html
#	both modified:      user_guide/helpers/inflector_helper.html
#	both modified:      user_guide/helpers/language_helper.html
#	both modified:      user_guide/helpers/number_helper.html
#	both modified:      user_guide/helpers/path_helper.html
#	both modified:      user_guide/helpers/security_helper.html
#	both modified:      user_guide/helpers/smiley_helper.html
#	both modified:      user_guide/helpers/string_helper.html
#	both modified:      user_guide/helpers/text_helper.html
#	both modified:      user_guide/helpers/typography_helper.html
#	both modified:      user_guide/helpers/xml_helper.html
#	both modified:      user_guide/index.html
#	both modified:      user_guide/installation/downloads.html
#	both modified:      user_guide/installation/index.html
#	both modified:      user_guide/installation/troubleshooting.html
#	both modified:      user_guide/installation/upgrade_120.html
#	both modified:      user_guide/installation/upgrade_130.html
#	both modified:      user_guide/installation/upgrade_131.html
#	both modified:      user_guide/installation/upgrade_132.html
#	both modified:      user_guide/installation/upgrade_133.html
#	both modified:      user_guide/installation/upgrade_140.html
#	both modified:      user_guide/installation/upgrade_141.html
#	both modified:      user_guide/installation/upgrade_150.html
#	both modified:      user_guide/installation/upgrade_152.html
#	both modified:      user_guide/installation/upgrade_153.html
#	both modified:      user_guide/installation/upgrade_154.html
#	both modified:      user_guide/installation/upgrade_160.html
#	both modified:      user_guide/installation/upgrade_161.html
#	both modified:      user_guide/installation/upgrade_162.html
#	both modified:      user_guide/installation/upgrade_163.html
#	both modified:      user_guide/installation/upgrade_170.html
#	both modified:      user_guide/installation/upgrade_171.html
#	both modified:      user_guide/installation/upgrade_172.html
#	both modified:      user_guide/installation/upgrade_200.html
#	both added:         user_guide/installation/upgrade_201.html
#	added by us:        user_guide/installation/upgrade_203.html
#	both modified:      user_guide/installation/upgrade_b11.html
#	both modified:      user_guide/installation/upgrading.html
#	both modified:      user_guide/libraries/benchmark.html
#	both added:         user_guide/libraries/caching.html
#	both modified:      user_guide/libraries/calendar.html
#	both modified:      user_guide/libraries/cart.html
#	both modified:      user_guide/libraries/config.html
#	both modified:      user_guide/libraries/email.html
#	both modified:      user_guide/libraries/encryption.html
#	both modified:      user_guide/libraries/file_uploading.html
#	both modified:      user_guide/libraries/form_validation.html
#	both modified:      user_guide/libraries/ftp.html
#	both modified:      user_guide/libraries/image_lib.html
#	both modified:      user_guide/libraries/input.html
#	both modified:      user_guide/libraries/javascript.html
#	both modified:      user_guide/libraries/language.html
#	both modified:      user_guide/libraries/loader.html
#	both modified:      user_guide/libraries/output.html
#	both modified:      user_guide/libraries/pagination.html
#	both modified:      user_guide/libraries/parser.html
#	both modified:      user_guide/libraries/security.html
#	both modified:      user_guide/libraries/sessions.html
#	both modified:      user_guide/libraries/table.html
#	both modified:      user_guide/libraries/trackback.html
#	both modified:      user_guide/libraries/typography.html
#	both modified:      user_guide/libraries/unit_testing.html
#	both modified:      user_guide/libraries/uri.html
#	both modified:      user_guide/libraries/user_agent.html
#	both modified:      user_guide/libraries/xmlrpc.html
#	both modified:      user_guide/libraries/zip.html
#	both modified:      user_guide/license.html
#	both modified:      user_guide/nav/nav.js
#	both modified:      user_guide/overview/appflow.html
#	both modified:      user_guide/overview/at_a_glance.html
#	both modified:      user_guide/overview/cheatsheets.html
#	both modified:      user_guide/overview/features.html
#	both modified:      user_guide/overview/getting_started.html
#	both modified:      user_guide/overview/goals.html
#	both modified:      user_guide/overview/index.html
#	both modified:      user_guide/overview/mvc.html
#	both modified:      user_guide/toc.html
#	added by them:      user_guide/tutorial/index.html

衝突したので手動で修正します。原則として REMOTE に合わせます。

$ git mergetool

コミットします。

$ git commit

GitHub へ push します。

$ git push -u origin release/2.1.0