Attempting to run most recent update and failing with Yarn error

moonmeister / xo-install-script

Script for setup and installation of Xen-Orchestra

MIT License

12 stars 3 forks source link

Attempting to run most recent update and failing with Yarn error #5

Closed astrugatch closed 6 years ago

astrugatch commented 7 years ago

Running the update script to get the latest Xen orchestra (has worked fine in the past) and I am getting the following error.

Updating f5febef..f20604d
error: Your local changes to the following files would be overwritten by merge:
    yarn.lock
Please, commit your changes or stash them before you can merge.

moonmeister commented 7 years ago

I just got this issue on an update. looks like xo needs to include the yarn.lock in their .gitignore. @olivierlambert can you shed light on this? Any reason this hasn't been done already?

In the meantime you can do a git checkout yarn.lock to reset it to the default version then re-run the update.