Running *composer update* is currently failing, claiming i have local edits
that conflict with the remote. However, i haven't done any edits to Cake
source files. i tried discarding the changes so the remote could
overwrite the files, and still got a failure.
Getting the same problem if i go to vendor/cakephp/cakephp/src and try to
do *git pull* (log from TortoiseGit):
git.exe pull -v --progress composer
From git://github.com/cakephp/cakephp
= [up to date] 3.0- composer/3.0
= [up to date] 1.3- composer/1.3
= [up to date] 2.4- composer/2.4
= [up to date] 2.6- composer/2.6
= [up to date] 3.0-hhvm-take2 - composer/3.0-hhvm-take2
= [up to date] 3.0-nest-label - composer/3.0-nest-label
= [up to date] 3.0-router-url - composer/3.0-router-url
= [up to date] 3.0-url-helper - composer/3.0-url-helper
= [up to date] gh-pages - composer/gh-pages
= [up to date] master - composer/master
Updating cd5fb7e..2edcc0b
error: Your local changes to the following files would be overwritten by
merge:
src/Console/Command/BakeShell.php
src/Console/Command/Task/SimpleBakeTask.php
src/Console/Command/Task/TestTask.php
src/Core/App.php
src/Core/Plugin.php
src/I18n/MessagesFileLoader.php
src/Network/Session.php
src/ORM/Marshaller.php
src/ORM/Table.php
src/Template/Bake/default/views/index.ctp
src/Template/Bake/default/views/view.ctp
src/TestSuite/Fixture/FixtureManager.php
tests/TestCase/Core/PluginTest.php
tests/TestCase/I18n/I18nTest.php
tests/TestCase/Network/SessionTest.php
tests/TestCase/ORM/MarshallerTest.php
Please, commit your changes or stash them before you can merge.
Aborting
git did not exit cleanly (exit code 1) (4337 ms @ 8/12/2014 9:57:06 PM)
There are 2 remotes detected when i try to pull: *composer* *origin*. The
*composer* remote sees there are 3.0 commits as recently as 9 hours ago (as
of writing), while *origin* says last 3.0 commit was 3 months ago.
*My composer.json config:*
{
name:cakephp/app,
description :CakePHP skeleton app,
homepage:http://cakephp.org;,
type:project,
license :MIT,
repositories:[
{
type :package,
package:{
name:openwall/phpass,
version :0.3,
dist:{
url
:http://www.openwall.com/phpass/phpass-0.3.tar.gz;,
type:tar
},
autoload:{
classmap:[
PasswordHash.php
]
}
}
}
],
require :{
php:=5.4.19,
cakephp/cakephp:3.0.*-dev,
zurb/foundation :dev-master,
tecnick.com/tcpdf :dev-master,
mobiledetect/mobiledetectlib :2.*,
openwall/phpass:*
},
require-dev :{
d11wtq/boris:1.0.*
},
suggest :{
phpunit/phpunit:Allows automated tests to be run without
system-wide install.
},
autoload:{
psr-4:{
App\\ :App,
App\\Test\\ :Test,
:./Plugin
}
},
scripts :{
post-install-cmd:App\\Console\\Installer::postInstall
}
}
The project was originally created from the Cake command line (following
the Blog tutorial) and i've been running *composer update* on it ever
since. Until now.
Any help? i see the Github page recommends creating new projects with the
3.0 App skeleton, but isn't that what i already have if i created the
project from the *cake* command? If not, what kind of hassle would i have
trying to transfer files into a new App skeleton?
Thanks in advance...
-joe
--
Like Us on FaceBook https://www.facebook.com/CakePHP
Find us on Twitter http://twitter.com/CakePHP
---
You received this message because you are subscribed to the Google Groups
CakePHP group.
To unsubscribe from this group and stop receiving emails from it, send an email
to cake-php+unsubscr...@googlegroups.com.
To post to this group, send email to cake-php@googlegroups.com.
Visit this group at http://groups.google.com/group/cake-php.
For more options, visit https://groups.google.com/d/optout.
