New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Composer update throws a "The following untracked working tree files would be overwritten by" #1351

Closed
mwjames opened this Issue Jan 6, 2016 · 3 comments

Comments

Projects
None yet
2 participants
@mwjames
Contributor

mwjames commented Jan 6, 2016

https://www.semantic-mediawiki.org/wiki/Thread:Help_talk:Using_Composer/update_composer_fails

[RuntimeException]                                                                                                                              
  Failed to execute git checkout 'f7543bcb7ad1b08c1924d65aeea9e353d5953381' -- && git reset --hard 'f7543bcb7ad1b08c1924d65aeea9e353d5953381' --  
  error: The following untracked working tree files would be overwritten by checkout:                                                             
    tests/phpunit/Integration/ByJsonScript/Fixtures/p-0408 [#1252] intext to use non-strict mode.json                                              
  Please move or remove them before you can switch branches.                                                                                      
  Aborting 
@mwjames

This comment has been minimized.

Show comment
Hide comment
@mwjames

mwjames Jan 6, 2016

Contributor

@kghbln I think composer/composer#2896 and composer/composer#3789 are relevant. Did you use a recent Composer version (which would include the latter) ?

I assume that due to using a specific github-branch at an earlier occasion, the git tree was out of sync and some files were missing the correct hash signature. As indicated by composer/composer#3789, option discard-changes should help finish the update.

Contributor

mwjames commented Jan 6, 2016

@kghbln I think composer/composer#2896 and composer/composer#3789 are relevant. Did you use a recent Composer version (which would include the latter) ?

I assume that due to using a specific github-branch at an earlier occasion, the git tree was out of sync and some files were missing the correct hash signature. As indicated by composer/composer#3789, option discard-changes should help finish the update.

@kghbln

This comment has been minimized.

Show comment
Hide comment
@kghbln

kghbln Jan 6, 2016

Member

Well, I did the brute force method I described on the wiki. I had changes to some files before, but was always asked if I would like to continue instead of getting an advice I took too serious. Probably I should indeed add the discard-changes option to my "composer.json" file.

Bevore I forget: I currently use Composer version 1.0-dev (72cd6afdfce16f36a9fd786bc1b2f32b851e764f) 2015-12-28 17:35:19 on the respective server.

Member

kghbln commented Jan 6, 2016

Well, I did the brute force method I described on the wiki. I had changes to some files before, but was always asked if I would like to continue instead of getting an advice I took too serious. Probably I should indeed add the discard-changes option to my "composer.json" file.

Bevore I forget: I currently use Composer version 1.0-dev (72cd6afdfce16f36a9fd786bc1b2f32b851e764f) 2015-12-28 17:35:19 on the respective server.

@mwjames mwjames closed this Jan 7, 2016

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment