Hello Visvanath,
I decided to nuke the install and begin again. Did that yesterday, following the instructions in the git installation guide:
$ git clone git://git.moodle.org/moodle.git (1)
$ cd moodle
$ git branch -a (2)
$ git branch --track MOODLE_25_STABLE origin/MOODLE_25_STABLE (3)
$ git checkout MOODLE_25_STABLE (4)
After doing that, I did a git pull a couple of times yesterday and git responded that the repository was up to date. Today, I did another git pull and got the following output (looks like what I was getting before):
git pull
remote: Counting objects: 2313, done.
remote: Compressing objects: 100% (365/365), done.
remote: Total 1218 (delta 903), reused 1129 (delta 835)
Receiving objects: 100% (1218/1218), 230.18 KiB, done.
Resolving deltas: 100% (903/903), completed with 333 local objects.
From git://git.moodle.org/moodle
b222cfb..f65261d MOODLE_25_STABLE -> origin/MOODLE_25_STABLE
c9b28fc..57af11e MOODLE_22_STABLE -> origin/MOODLE_22_STABLE
f0d8c53..7621b70 MOODLE_23_STABLE -> origin/MOODLE_23_STABLE
e038687..bf2bee1 MOODLE_24_STABLE -> origin/MOODLE_24_STABLE
e2637d1..73f560c master -> origin/master
Updating b222cfb..f65261d
error: Your local changes to the following files would be overwritten by merge:
admin/tests/behat/upload_users.feature
admin/tool/customlang/db/upgrade.php
auth/cas/version.php
auth/ldap/version.php
auth/manual/db/upgrade.php
auth/mnet/db/upgrade.php
backup/backup.class.php
blocks/community/db/upgrade.php
blocks/completionstatus/db/upgrade.php
blocks/course_summary/db/upgrade.php
blocks/html/db/upgrade.php
blocks/navigation/db/upgrade.php
blocks/section_links/db/upgrade.php
blocks/selfcompletion/db/upgrade.php
blocks/settings/db/upgrade.php
cohort/tests/behat/add_cohort.feature
cohort/tests/behat/behat_cohort.php
cohort/tests/behat/upload_cohort_users.feature
course/request_form.php
course/resources.php
course/tests/behat/behat_course.php
course/tests/behat/course_controls.feature
course/tests/behat/move_activities.feature
enrol/authorize/db/upgrade.php
enrol/database/db/upgrade.php
enrol/flatfile/db/upgrade.php
enrol/guest/db/upgrade.php
enrol/imsenterprise/db/upgrade.php
enrol/manual/db/upgrade.php
enrol/mnet/db/upgrade.php
enrol/paypal/db/upgrade.php
enrol/self/db/upgrade.php
files/coursefilesedit_form.php
filter/mediaplugin/db/upgrade.php
filter/tex/db/upgrade.php
grade/grading/form/rubric/db/upgrade.php
install/lang/bn/install.php
install/lang/ca_valencia/langconfig.php
install/lang/cy/admin.php
install/lang/cy/error.php
install/lang/cy/install.php
install/lang/en_kids/langconfig.php
install/lang/eu/install.php
install/lang/fr/error.php
install/lang/is/admin.php
install/lang/it/error.php
install/lang/it/install.php
install/lang/ja_kids/langconfig.php
install/lang/ka/admin.php
install/lang/ka/moodle.php
install/lang/kl/langconfig.php
install/lang/ko/install.php
install/lang/lt_uni/moodle.php
install/lang/so/admin.php
install/lang/sr_cr/error.php
install/lang/sr_lt/error.php
install/lang/te/langconfig.php
install/lang/tt/langconfig.php
install/lang/wo/langconfig.php
install/lang/zh_tw/langconfig.php
lang/en/repository.php
lib/db/upgrade.php
lib/editor/tinymce/db/upgrade.php
lib/editor/tinymce/plugins/spellchecker/db/upgrade.php
lib/filelib.php
lib/filestorage/file_storage.php
lib/filestorage/stored_file.php
lib/licenselib.php
lib/tests/behat/behat_general.php
lib/tests/behat/behat_hooks.php
lib/tests/behat/behat_navigation.php
lib/tests/behat/behat_permissions.php
lib/yuilib/3.9.1/build/io-xdr/io.swf
lib/yuilib/3.9.1/build/uploader-deprecated/assets/uploader.swf
lib/yuilib/3.9.1/build/uploader/assets/flashuploader.swf
message/output/email/db/upgrade.php
message/output/jabber/db/upgrade.php
message/output/popup/db/upgrade.php
mod/assign/db/upgrade.php
mod/assign/feedback/comments/db/upgrade.php
mod/assign/feedback/file/db/upgrade.php
mod/assign/submission/comments/db/upgrade.php
mod/assign/submission/file/db/upgrade.php
mod/assign/submission/onlinetext/db/upgrade.php
mod/assignment/db/upgrade.php
mod/book/db/upgrade.php
mod/chat/db/upgrade.php
mod/choice/db/upgrade.php
mod/data/db/upgrade.php
mod/feedback/db/upgrade.php
mod/folder/db/upgrade.php
mod/folder/edit.php
mod/forum/db/upgrade.php
mod/forum/lib.php
mod/glossary/db/upgrade.php
mod/imscp/db/upgrade.php
mod/label/db/upgrade.php
mod/lesson/db/upgrade.php
mod/lti/db/upgrade.php
mod/page/db/upgrade.php
mod/quiz/db/upgrade.php
mod/quiz/report/overview/db/upgrade.php
mod/quiz/report/overview/report.php
mod/quiz/report/statistics/db/upgrade.php
mod/resource/db/upgrade.php
mod/scorm/datamodels/scorm_12.js.php
mod/scorm/db/upgrade.php
mod/survey/db/upgrade.php
mod/url/db/upgrade.php
mod/wiki/db/upgrade.php
mod/workshop/db/upgrade.php
mod/workshop/form/accumulative/db/upgrade.php
mod/workshop/form/comments/db/upgrade.php
mod/workshop/form/numerrors/db/upgrade.php
mod/workshop/form/rubric/db/upgrade.php
portfolio/googledocs/db/upgrade.php
portfolio/picasa/db/upgrade.php
question/behaviour/manualgraded/db/upgrade.php
question/engine/bank.php
question/type/calculated/db/upgrade.php
question/type/essay/db/upgrade.php
question/type/match/db/upgrade.php
question/
Aborting
My moodle system is running on ubuntu 12.04.
Rick