Closed baskettcase closed 8 years ago
You can just git pull again I think? Might be worth changing over to the composer install, see the current readme, then you can update by "composer update" ;)
Thanks @Ni42 Ill check out the composer install method, I didn't realize there was one!, that would indeed be a lot easier :)
It got changed earlier today :)
With git you'd do git fetch origin
, followed by a git pull
. If you have local changes, though, there might be conflicts.
You'll also have these conflicts with composer if you "add your own files", since you shouldn't do that in the vendor dir.
Also, see this on how to define a useful git up
.
Thanks, I went with the composer method and no I don't add anything to the vendor directory. Im just talking about my own code using the libraries :) Although everything is broken right now until PHP 5.6 support comes back.
Good then, just wanted to pre-eliminate that. Having a examples folder inside this repo makes some people do such things I fear.
Resolved.
What is the proper method to update? If I have done a git clone on my server and then I've added my own files.. do I just do another git clone in the same folder and it overwrites and then I need to do another composer update? or will that overwrite my additional files? I haven't edited core.