Forum OpenACS Development: Because of git, any of you can try the merge. I did, here is my results:

jim@orie:~/openacs$ git clone https://github.com/openacs/openacs-core oacscore-mergetest
Cloning into 'oacscore-mergetest'...
remote: Counting objects: 101106, done.
remote: Total 101106 (delta 0), reused 0 (delta 0), pack-reused 101106
Receiving objects: 100% (101106/101106), 42.83 MiB | 898.00 KiB/s, done.
Resolving deltas: 100% (78845/78845), done.
Checking connectivity... done.
Checking out files: 100% (7914/7914), done.
jim@orie:~/openacs$ 
jim@orie:~/openacs$ 
jim@orie:~/openacs$ cd oacscore-mergetest/
jim@orie:~/openacs/oacscore-mergetest$ git status | less
jim@orie:~/openacs/oacscore-mergetest$ git checkout master
Branch master set up to track remote branch master from origin.
Switched to a new branch 'master'
jim@orie:~/openacs/oacscore-mergetest$ git status | less
jim@orie:~/openacs/oacscore-mergetest$ git merge oacs-5-8
Auto-merging packages/tsearch2-driver/tsearch2-driver.info
CONFLICT (content): Merge conflict in packages/tsearch2-driver/tsearch2-driver.info
Auto-merging packages/tsearch2-driver/tcl/tsearch2-driver-procs.tcl
Auto-merging packages/search/www/search.tcl
CONFLICT (content): Merge conflict in packages/search/www/search.tcl
Auto-merging packages/search/search.info
CONFLICT (content): Merge conflict in packages/search/search.info
Auto-merging packages/ref-timezones/ref-timezones.info
CONFLICT (content): Merge conflict in packages/ref-timezones/ref-timezones.info
Auto-merging packages/ref-language/ref-language.info
CONFLICT (content): Merge conflict in packages/ref-language/ref-language.info
Auto-merging packages/ref-countries/ref-countries.info
CONFLICT (content): Merge conflict in packages/ref-countries/ref-countries.info
Auto-merging packages/openacs-default-theme/openacs-default-theme.info
CONFLICT (content): Merge conflict in packages/openacs-default-theme/openacs-default-theme.info
Auto-merging packages/notifications/notifications.info
CONFLICT (content): Merge conflict in packages/notifications/notifications.info
Removing packages/intermedia-driver/sql/oracle/intermedia-driver-drop.sql~
Auto-merging packages/intermedia-driver/intermedia-driver.info
CONFLICT (content): Merge conflict in packages/intermedia-driver/intermedia-driver.info
Auto-merging packages/acs-translations/acs-translations.info
CONFLICT (content): Merge conflict in packages/acs-translations/acs-translations.info
Removing packages/acs-templating/www/resources/xinha-nightly/plugins/SuperClean/tidy.php
Removing packages/acs-templating/www/resources/xinha-nightly/plugins/SpellChecker/spell-check-savedicts.php
Removing packages/acs-templating/www/resources/xinha-nightly/plugins/SpellChecker/spell-check-logic.php
Removing packages/acs-templating/www/resources/xinha-nightly/plugins/SpellChecker/aspell_setup.php
Removing packages/acs-templating/www/resources/xinha-nightly/plugins/PSServer/config.inc.php
Removing packages/acs-templating/www/resources/xinha-nightly/plugins/PSServer/backend.php
Removing packages/acs-templating/www/resources/xinha-nightly/plugins/MootoolsFileManager/mootools-filemanager/Demos/selectImage.php
Removing packages/acs-templating/www/resources/xinha-nightly/plugins/MootoolsFileManager/mootools-filemanager/Demos/manager.php
Removing packages/acs-templating/www/resources/xinha-nightly/plugins/MootoolsFileManager/mootools-filemanager/Backend/Upload.php
Removing packages/acs-templating/www/resources/xinha-nightly/plugins/MootoolsFileManager/mootools-filemanager/Backend/Image.php
Removing packages/acs-templating/www/resources/xinha-nightly/plugins/MootoolsFileManager/mootools-filemanager/Backend/FileManager.php
Removing packages/acs-templating/www/resources/xinha-nightly/plugins/MootoolsFileManager/mootools-filemanager/Backend/Assets/getid3/module.tag.lyrics3.php
Removing packages/acs-templating/www/resources/xinha-nightly/plugins/MootoolsFileManager/mootools-filemanager/Backend/Assets/getid3/module.tag.id3v2.php
Removing packages/acs-templating/www/resources/xinha-nightly/plugins/MootoolsFileManager/mootools-filemanager/Backend/Assets/getid3/module.tag.id3v1.php
Removing packages/acs-templating/www/resources/xinha-nightly/plugins/MootoolsFileManager/mootools-filemanager/Backend/Assets/getid3/module.tag.apetag.php
Removing packages/acs-templating/www/resources/xinha-nightly/plugins/MootoolsFileManager/mootools-filemanager/Backend/Assets/getid3/module.misc.iso.php
Removing packages/acs-templating/www/resources/xinha-nightly/plugins/MootoolsFileManager/mootools-filemanager/Backend/Assets/getid3/module.lib.image_size.php
Removing packages/acs-templating/www/resources/xinha-nightly/plugins/MootoolsFileManager/mootools-filemanager/Backend/Assets/getid3/module.lib.iconv_replacement.php
Removing packages/acs-templating/www/resources/xinha-nightly/plugins/MootoolsFileManager/mootools-filemanager/Backend/Assets/getid3/module.lib.data_hash.php
Removing packages/acs-templating/www/resources/xinha-nightly/plugins/MootoolsFileManager/mootools-filemanager/Backend/Assets/getid3/module.graphic.tiff.php
Removing packages/acs-templating/www/resources/xinha-nightly/plugins/MootoolsFileManager/mootools-filemanager/Backend/Assets/getid3/module.graphic.png.php
Removing packages/acs-templating/www/resources/xinha-nightly/plugins/MootoolsFileManager/mootools-filemanager/Backend/Assets/getid3/module.graphic.pcd.php
Removing packages/acs-templating/www/resources/xinha-nightly/plugins/MootoolsFileManager/mootools-filemanager/Backend/Assets/getid3/module.graphic.jpeg.php
Removing packages/acs-templating/www/resources/xinha-nightly/plugins/MootoolsFileManager/mootools-filemanager/Backend/Assets/getid3/module.graphic.gif.php
Removing packages/acs-templating/www/resources/xinha-nightly/plugins/MootoolsFileManager/mootools-filemanager/Backend/Assets/getid3/module.graphic.bmp.php
Removing packages/acs-templating/www/resources/xinha-nightly/plugins/MootoolsFileManager/mootools-filemanager/Backend/Assets/getid3/module.audio.xiph.php
Removing packages/acs-templating/www/resources/xinha-nightly/plugins/MootoolsFileManager/mootools-filemanager/Backend/Assets/getid3/module.audio.wavpack.php
Removing packages/acs-templating/www/resources/xinha-nightly/plugins/MootoolsFileManager/mootools-filemanager/Backend/Assets/getid3/module.audio.vqf.php
Removing packages/acs-templating/www/resources/xinha-nightly/plugins/MootoolsFileManager/mootools-filemanager/Backend/Assets/getid3/module.audio.voc.php
Removing packages/acs-templating/www/resources/xinha-nightly/plugins/MootoolsFileManager/mootools-filemanager/Backend/Assets/getid3/module.audio.tta.php
Removing packages/acs-templating/www/resources/xinha-nightly/plugins/MootoolsFileManager/mootools-filemanager/Backend/Assets/getid3/module.audio.shorten.php
Removing packages/acs-templating/www/resources/xinha-nightly/plugins/MootoolsFileManager/mootools-filemanager/Backend/Assets/getid3/module.audio.rkau.php
Removing packages/acs-templating/www/resources/xinha-nightly/plugins/MootoolsFileManager/mootools-filemanager/Backend/Assets/getid3/module.audio.optimfrog.php
Removing packages/acs-templating/www/resources/xinha-nightly/plugins/MootoolsFileManager/mootools-filemanager/Backend/Assets/getid3/module.audio.mpc_old.php
Removing packages/acs-templating/www/resources/xinha-nightly/plugins/MootoolsFileManager/mootools-filemanager/Backend/Assets/getid3/module.audio.mpc.php
Removing packages/acs-templating/www/resources/xinha-nightly/plugins/MootoolsFileManager/mootools-filemanager/Backend/Assets/getid3/module.audio.mp3.php
Removing packages/acs-templating/www/resources/xinha-nightly/plugins/MootoolsFileManager/mootools-filemanager/Backend/Assets/getid3/module.audio.monkey.php
Removing packages/acs-templating/www/resources/xinha-nightly/plugins/MootoolsFileManager/mootools-filemanager/Backend/Assets/getid3/module.audio.midi.php
Removing packages/acs-templating/www/resources/xinha-nightly/plugins/MootoolsFileManager/mootools-filemanager/Backend/Assets/getid3/module.audio.lpac.php
Removing packages/acs-templating/www/resources/xinha-nightly/plugins/MootoolsFileManager/mootools-filemanager/Backend/Assets/getid3/module.audio.la.php
Removing packages/acs-templating/www/resources/xinha-nightly/plugins/MootoolsFileManager/mootools-filemanager/Backend/Assets/getid3/module.audio.dts.php
Removing packages/acs-templating/www/resources/xinha-nightly/plugins/MootoolsFileManager/mootools-filemanager/Backend/Assets/getid3/module.audio.bonk.php
Removing packages/acs-templating/www/resources/xinha-nightly/plugins/MootoolsFileManager/mootools-filemanager/Backend/Assets/getid3/module.audio.avr.php
Removing packages/acs-templating/www/resources/xinha-nightly/plugins/MootoolsFileManager/mootools-filemanager/Backend/Assets/getid3/module.audio.au.php
Removing packages/acs-templating/www/resources/xinha-nightly/plugins/MootoolsFileManager/mootools-filemanager/Backend/Assets/getid3/module.audio.ac3.php
Removing packages/acs-templating/www/resources/xinha-nightly/plugins/MootoolsFileManager/mootools-filemanager/Backend/Assets/getid3/module.audio.aac_adts.php
Removing packages/acs-templating/www/resources/xinha-nightly/plugins/MootoolsFileManager/mootools-filemanager/Backend/Assets/getid3/module.audio.aac_adif.php
Removing packages/acs-templating/www/resources/xinha-nightly/plugins/MootoolsFileManager/mootools-filemanager/Backend/Assets/getid3/module.audio-video.swf.php
Removing packages/acs-templating/www/resources/xinha-nightly/plugins/MootoolsFileManager/mootools-filemanager/Backend/Assets/getid3/module.audio-video.riff.php
Removing packages/acs-templating/www/resources/xinha-nightly/plugins/MootoolsFileManager/mootools-filemanager/Backend/Assets/getid3/module.audio-video.real.php
Removing packages/acs-templating/www/resources/xinha-nightly/plugins/MootoolsFileManager/mootools-filemanager/Backend/Assets/getid3/module.audio-video.quicktime.php
Removing packages/acs-templating/www/resources/xinha-nightly/plugins/MootoolsFileManager/mootools-filemanager/Backend/Assets/getid3/module.audio-video.nsv.php
Removing packages/acs-templating/www/resources/xinha-nightly/plugins/MootoolsFileManager/mootools-filemanager/Backend/Assets/getid3/module.audio-video.mpeg.php
Removing packages/acs-templating/www/resources/xinha-nightly/plugins/MootoolsFileManager/mootools-filemanager/Backend/Assets/getid3/module.audio-video.flv.php
Removing packages/acs-templating/www/resources/xinha-nightly/plugins/MootoolsFileManager/mootools-filemanager/Backend/Assets/getid3/module.audio-video.asf.php
Removing packages/acs-templating/www/resources/xinha-nightly/plugins/MootoolsFileManager/mootools-filemanager/Backend/Assets/getid3/module.archive.zip.php
Removing packages/acs-templating/www/resources/xinha-nightly/plugins/MootoolsFileManager/mootools-filemanager/Backend/Assets/getid3/module.archive.tar.php
Removing packages/acs-templating/www/resources/xinha-nightly/plugins/MootoolsFileManager/mootools-filemanager/Backend/Assets/getid3/module.archive.szip.php
Removing packages/acs-templating/www/resources/xinha-nightly/plugins/MootoolsFileManager/mootools-filemanager/Backend/Assets/getid3/module.archive.gzip.php
Removing packages/acs-templating/www/resources/xinha-nightly/plugins/MootoolsFileManager/mootools-filemanager/Backend/Assets/getid3/getid3.php
Removing packages/acs-templating/www/resources/xinha-nightly/plugins/MootoolsFileManager/mootools-filemanager/Assets/dewplayer.swf
Removing packages/acs-templating/www/resources/xinha-nightly/plugins/MootoolsFileManager/mootools-filemanager/Assets/Swiff.Uploader.swf
Removing packages/acs-templating/www/resources/xinha-nightly/plugins/MootoolsFileManager/config.php
Removing packages/acs-templating/www/resources/xinha-nightly/plugins/MootoolsFileManager/backend.php
Removing packages/acs-templating/www/resources/xinha-nightly/plugins/Linker/scan.php
Removing packages/acs-templating/www/resources/xinha-nightly/plugins/InsertSnippet2/snippets.php
Removing packages/acs-templating/www/resources/xinha-nightly/plugins/InsertSnippet/snippets.php
Removing packages/acs-templating/www/resources/xinha-nightly/plugins/InsertSmiley/smileys/smileys.php
Removing packages/acs-templating/www/resources/xinha-nightly/plugins/InsertPicture/InsertPicture.php
Removing packages/acs-templating/www/resources/xinha-nightly/plugins/ImageManager/youtube.php
Removing packages/acs-templating/www/resources/xinha-nightly/plugins/ImageManager/thumbs.php
Removing packages/acs-templating/www/resources/xinha-nightly/plugins/ImageManager/swfobject/expressinstall.swf
Removing packages/acs-templating/www/resources/xinha-nightly/plugins/ImageManager/resizer.php
Removing packages/acs-templating/www/resources/xinha-nightly/plugins/ImageManager/manager.php
Removing packages/acs-templating/www/resources/xinha-nightly/plugins/ImageManager/img/Thumbs.db
Removing packages/acs-templating/www/resources/xinha-nightly/plugins/ImageManager/images.php
Removing packages/acs-templating/www/resources/xinha-nightly/plugins/ImageManager/flickr.php
Removing packages/acs-templating/www/resources/xinha-nightly/plugins/ImageManager/editorFrame.php
Removing packages/acs-templating/www/resources/xinha-nightly/plugins/ImageManager/editor.php
Removing packages/acs-templating/www/resources/xinha-nightly/plugins/ImageManager/ddt.php
Removing packages/acs-templating/www/resources/xinha-nightly/plugins/ImageManager/config.inc.php
Removing packages/acs-templating/www/resources/xinha-nightly/plugins/ImageManager/backend.php
Removing packages/acs-templating/www/resources/xinha-nightly/plugins/ImageManager/Classes/Transform.php
Removing packages/acs-templating/www/resources/xinha-nightly/plugins/ImageManager/Classes/Thumbnail.php
Removing packages/acs-templating/www/resources/xinha-nightly/plugins/ImageManager/Classes/NetPBM.php
Removing packages/acs-templating/www/resources/xinha-nightly/plugins/ImageManager/Classes/JSON_Compat.php
Removing packages/acs-templating/www/resources/xinha-nightly/plugins/ImageManager/Classes/JSON.php
Removing packages/acs-templating/www/resources/xinha-nightly/plugins/ImageManager/Classes/ImageManager.php
Removing packages/acs-templating/www/resources/xinha-nightly/plugins/ImageManager/Classes/ImageEditor.php
Removing packages/acs-templating/www/resources/xinha-nightly/plugins/ImageManager/Classes/IM.php
Removing packages/acs-templating/www/resources/xinha-nightly/plugins/ImageManager/Classes/GD.php
Removing packages/acs-templating/www/resources/xinha-nightly/plugins/ImageManager/Classes/Flickr.php
Removing packages/acs-templating/www/resources/xinha-nightly/plugins/ImageManager/Classes/Files.php
Removing packages/acs-templating/www/resources/xinha-nightly/plugins/HtmlTidy/html-tidy-logic.php
Removing packages/acs-templating/www/resources/xinha-nightly/plugins/FormOperations/formmail.php
Removing packages/acs-templating/www/resources/xinha-nightly/plugins/ExtendedFileManager/thumbs.php
Removing packages/acs-templating/www/resources/xinha-nightly/plugins/ExtendedFileManager/resizer.php
Removing packages/acs-templating/www/resources/xinha-nightly/plugins/ExtendedFileManager/manager.php
Removing packages/acs-templating/www/resources/xinha-nightly/plugins/ExtendedFileManager/images.php
Removing packages/acs-templating/www/resources/xinha-nightly/plugins/ExtendedFileManager/editorFrame.php
Removing packages/acs-templating/www/resources/xinha-nightly/plugins/ExtendedFileManager/editor.php
Removing packages/acs-templating/www/resources/xinha-nightly/plugins/ExtendedFileManager/config.inc.php
Removing packages/acs-templating/www/resources/xinha-nightly/plugins/ExtendedFileManager/backend.php
Removing packages/acs-templating/www/resources/xinha-nightly/plugins/ExtendedFileManager/Classes/ExtendedFileManager.php
Removing packages/acs-templating/www/resources/xinha-nightly/examples/files/ext_example-menu.php
Removing packages/acs-templating/www/resources/xinha-nightly/examples/files/ext_example-dest.php
Removing packages/acs-templating/www/resources/xinha-nightly/examples/ext_example-menu.php
Removing packages/acs-templating/www/resources/xinha-nightly/examples/ext_example-dest.php
Removing packages/acs-templating/www/resources/xinha-nightly/contrib/yuicompressor-2.4.2.jar
Removing packages/acs-templating/www/resources/xinha-nightly/contrib/php-xinha.php
Removing packages/acs-templating/www/resources/xinha-nightly/contrib/lc_parse_strings.php
Removing packages/acs-templating/www/resources/xinha-nightly/contrib/lc_merge_strings.php
Removing packages/acs-templating/www/resources/xinha-nightly/contrib/dojo_js_compressor.jar
Removing packages/acs-templating/www/resources/xinha-nightly/contrib/compress_yui.php
Removing packages/acs-templating/www/resources/xinha-nightly/contrib/compress.php
Auto-merging packages/acs-templating/tcl/util-procs.tcl
CONFLICT (content): Merge conflict in packages/acs-templating/tcl/util-procs.tcl
Auto-merging packages/acs-templating/tcl/tag-procs.tcl
CONFLICT (content): Merge conflict in packages/acs-templating/tcl/tag-procs.tcl
Auto-merging packages/acs-templating/acs-templating.info
CONFLICT (content): Merge conflict in packages/acs-templating/acs-templating.info
Removing packages/acs-tcl/tcl/widgets-procs.xql
Auto-merging packages/acs-tcl/tcl/utilities-procs.tcl
CONFLICT (content): Merge conflict in packages/acs-tcl/tcl/utilities-procs.tcl
Auto-merging packages/acs-tcl/tcl/security-procs.tcl
Auto-merging packages/acs-tcl/tcl/http-client-procs.tcl
CONFLICT (add/add): Merge conflict in packages/acs-tcl/tcl/http-client-procs.tcl
Removing packages/acs-tcl/tcl/admin-procs.xql
Auto-merging packages/acs-tcl/tcl/00-database-procs.tcl
Auto-merging packages/acs-tcl/acs-tcl.info
CONFLICT (content): Merge conflict in packages/acs-tcl/acs-tcl.info
Auto-merging packages/acs-subsite/www/admin/groups/new.tcl
CONFLICT (content): Merge conflict in packages/acs-subsite/www/admin/groups/new.tcl
Auto-merging packages/acs-subsite/www/admin/groups/elements-by-rel-type.tcl
Auto-merging packages/acs-subsite/acs-subsite.info
CONFLICT (content): Merge conflict in packages/acs-subsite/acs-subsite.info
Removing packages/acs-service-contract/tcl/msg-type-procs.xql
Auto-merging packages/acs-service-contract/acs-service-contract.info
CONFLICT (content): Merge conflict in packages/acs-service-contract/acs-service-contract.info
Auto-merging packages/acs-reference/www/doc/requirements.adp
CONFLICT (add/add): Merge conflict in packages/acs-reference/www/doc/requirements.adp
Auto-merging packages/acs-reference/www/doc/design.adp
CONFLICT (add/add): Merge conflict in packages/acs-reference/www/doc/design.adp
Auto-merging packages/acs-reference/acs-reference.info
CONFLICT (content): Merge conflict in packages/acs-reference/acs-reference.info
Auto-merging packages/acs-messaging/acs-messaging.info
CONFLICT (content): Merge conflict in packages/acs-messaging/acs-messaging.info
Auto-merging packages/acs-mail-lite/tcl/acs-mail-lite-procs.tcl
CONFLICT (content): Merge conflict in packages/acs-mail-lite/tcl/acs-mail-lite-procs.tcl
Auto-merging packages/acs-mail-lite/acs-mail-lite.info
CONFLICT (content): Merge conflict in packages/acs-mail-lite/acs-mail-lite.info
Removing packages/acs-lang/www/admin/test/tz-test.tcl
Removing packages/acs-lang/www/admin/test/translator-mode.tcl
Removing packages/acs-lang/www/admin/test/translator-mode.adp
Removing packages/acs-lang/www/admin/test/timezone.tcl
Removing packages/acs-lang/www/admin/test/timezone.adp
Removing packages/acs-lang/www/admin/test/timezone-postgresql.xql
Removing packages/acs-lang/www/admin/test/timezone-oracle.xql
Removing packages/acs-lang/www/admin/test/test.tcl
Removing packages/acs-lang/www/admin/test/test.adp
Removing packages/acs-lang/www/admin/test/test-postgresql.xql
Removing packages/acs-lang/www/admin/test/test-oracle.xql
Removing packages/acs-lang/www/admin/test/show.tcl
Removing packages/acs-lang/www/admin/test/show-catalog.tcl
Removing packages/acs-lang/www/admin/test/show-catalog.adp
Removing packages/acs-lang/www/admin/test/index.html
Removing packages/acs-lang/www/admin/test/format-test.tcl
Removing packages/acs-lang/www/admin/test/format-test.adp
Removing packages/acs-lang/www/admin/test/format-test-postgresql.xql
Removing packages/acs-lang/www/admin/test/format-test-oracle.xql
Removing packages/acs-lang/www/admin/test/compile.tcl
Removing packages/acs-lang/www/admin/test/catalog-test.tcl
Removing packages/acs-lang/www/admin/test/catalog-test.adp
Auto-merging packages/acs-lang/acs-lang.info
CONFLICT (content): Merge conflict in packages/acs-lang/acs-lang.info
Removing packages/acs-kernel/sql/test/groups-test.sql
Removing packages/acs-kernel/sql/test/acs-objects-test.sql
Auto-merging packages/acs-kernel/acs-kernel.info
CONFLICT (content): Merge conflict in packages/acs-kernel/acs-kernel.info
Auto-merging packages/acs-core-docs/acs-core-docs.info
CONFLICT (content): Merge conflict in packages/acs-core-docs/acs-core-docs.info
Auto-merging packages/acs-content-repository/tcl/content-item-procs.tcl
CONFLICT (content): Merge conflict in packages/acs-content-repository/tcl/content-item-procs.tcl
Removing packages/acs-content-repository/java/PerlTools.jar
Auto-merging packages/acs-content-repository/acs-content-repository.info
CONFLICT (content): Merge conflict in packages/acs-content-repository/acs-content-repository.info
Auto-merging packages/acs-bootstrap-installer/acs-bootstrap-installer.info
CONFLICT (content): Merge conflict in packages/acs-bootstrap-installer/acs-bootstrap-installer.info
Auto-merging packages/acs-automated-testing/acs-automated-testing.info
CONFLICT (content): Merge conflict in packages/acs-automated-testing/acs-automated-testing.info
Auto-merging packages/acs-authentication/tcl/test/acs-authentication-procs.tcl
CONFLICT (content): Merge conflict in packages/acs-authentication/tcl/test/acs-authentication-procs.tcl
Auto-merging packages/acs-authentication/acs-authentication.info
CONFLICT (content): Merge conflict in packages/acs-authentication/acs-authentication.info
Auto-merging packages/acs-api-browser/acs-api-browser.info
CONFLICT (content): Merge conflict in packages/acs-api-browser/acs-api-browser.info
Removing packages/acs-admin/www/users/sessions-registered-summary.tcl
Removing packages/acs-admin/www/users/sessions-one-month.tcl
Removing packages/acs-admin/www/users/session-history.tcl
Removing packages/acs-admin/www/test/signed-cookies-test.tcl
Removing packages/acs-admin/www/test/signed-cookies-test-2.xql
Removing packages/acs-admin/www/test/signed-cookies-test-2.tcl
Removing packages/acs-admin/www/test/security-test.tcl
Removing packages/acs-admin/www/apm/version-view.xql
Removing packages/acs-admin/www/apm/version-tag.xql
Removing packages/acs-admin/www/apm/version-tag.tcl
Removing packages/acs-admin/www/apm/version-parameter-values.xql
Removing packages/acs-admin/www/apm/version-parameter-values.tcl
Removing packages/acs-admin/www/apm/version-generate-diffs.xql
Removing packages/acs-admin/www/apm/version-generate-diffs.tcl
Removing packages/acs-admin/www/apm/version-files.adp
Removing packages/acs-admin/www/apm/version-edit.xql
Removing packages/acs-admin/www/apm/parameter-add.xql
Auto-merging packages/acs-admin/www/apm/packages/index.vuh
Removing packages/acs-admin/www/apm/package-scan.tcl
Removing packages/acs-admin/www/apm/package-add.xql
Removing packages/acs-admin/www/apm/cvs-status.xql
Removing packages/acs-admin/www/apm/cvs-status.tcl
Removing packages/acs-admin/www/apm/bulk-intall.xql
Removing packages/acs-admin/www/apm/bulk-intall.tcl
Removing packages/acs-admin/www/apm/build-repository.tcl
Auto-merging packages/acs-admin/acs-admin.info
CONFLICT (content): Merge conflict in packages/acs-admin/acs-admin.info
Removing ChangeLog-recent
Removing ChangeLog-latest
Automatic merge failed; fix conflicts and then commit the result.
jim@orie:~/openacs/oacscore-mergetest$

The clone took like 30 secs or so, the merge took about two seconds.

-Jim

Maybe you're afraid to see all the conflicts... I have news: the number of lines containing CONFLICT: 36; the number of those lines that contained .info: 25.

My guess is that to resolve the 25 lines, half hour. Estimated time to resolve the rest: 1 - 2 hours.

Interesting, huh?

-Jim

Of course, it's not just because of git you can try the merge and other things under git.... Victor Guerra was the one who started and who found the available programs that could read a CVS repo and make a git repo out of it, and as I understand it he also wrote a script that can run periodically to form the new changes to the repo.

Also as I understand things Gustaf wrote some parts of the installer that uses git instead of CVS to move packages into download areas.

Have there been other contributors who have helped in the process which made git possible?

-Jim