getting 'Aborting' after git has pulled some files

Question

I use git for versioning, I am trying to pull code changes from the server. As i run 'git pull origin master', after pulling some files its showing me 'Aborting'. Whats this about, I have been working on git past 3 months but no such thing happened. Is there something corrupted?

Also unable to 'git push' since all the files have not been pulled

its like:

 * branch            master     -> FETCH_HEAD
error: The following untracked working tree files would be overwritten by merge:
    sites/all/modules/examples/form_example/form_example_tutorial.inc
    sites/all/modules/examples/form_example/form_example_wizard.inc
    sites/all/modules/examples/image_example/image_example.info
    sites/all/modules/examples/image_example/image_example.install
    sites/all/modules/examples/image_example/image_example.module
    sites/all/modules/examples/image_example/image_example.pages.inc
    sites/all/modules/examples/image_example/image_example.test
    sites/all/modules/examples/js_example/accordion.tpl.php
    sites/all/modules/examples/js_example/css/jsweights.css
    sites/all/modules/examples/js_example/js/ajaxy.js
    sites/all/modules/examples/js_example/js/black.js
    sites/all/modules/examples/js_example/js/blue.js
    sites/all/modules/examples/js_example/js/brown.js
    sites/all/modules/examples/js_example/js/green.js
    sites/all/modules/examples/js_example/js/purple.js
    sites/all/modules/examples/js_example/js/red.js
    sites/all/modules/examples/js_example/js_example.info
    sites/all/modules/examples/js_example/js_example.module
    sites/all/modules/examples/menu_example/menu_example.info
    sites/all/modules/examples/menu_example/menu_example.module
    sites/all/modules/examples/menu_example/menu_example.tes
Aborting

Answer 1

All those files it lists are untracked in your local branch, so if you do the merge, any changes you have made to those files will be irretrievably lost. Therefore, git doesn't let you do the merge.

To fix it, either delete all those files from your working tree or add and commit them, depending on if you want to keep your local changes to them or not.