Geek Answers Handbook

Getting "Cancel" after git has pulled out some files

I am using git for version control, I am trying to fetch code changes from the server. When I run 'git pull origin master', pulling out some files, it will show me "Aborting". About this, I have been working on git for the last 3 months, but this has not happened. Is something bad?

It is also impossible to "git push", because all the files were not 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
+4
source share
2 answers

All these files that he lists are not tracked at your local branch, so if you merge, any changes you make to these files will be irretrievably lost. Therefore, git does not allow merging.

To fix this, delete all these files from the working tree or add them and copy them, depending on whether you want to save their local changes or not.

+7
source

Is the local branch being tracked? There is a configuration file in the .git folder:

 [core] repositoryformatversion = 0 filemode = false bare = false logallrefupdates = true symlinks = false ignorecase = true hideDotFiles = dotGitOnly [remote "origin"] fetch = +refs/heads/*:refs/remotes/origin/* url = //cunim/Repositories/AvaPA.git [branch "master"] remote = origin merge = refs/heads/master [branch "dev"] remote = origin merge = refs/heads/dev

There must be an entry for the branch you are on so that it can be dropped back

Here is a set of git video tutorials we found very useful

http://www.ava.co.uk/git

0
source

More articles:


All Articles