Skip to content
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.

Sign up for GitHub

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

Jump to bottom

LabManager's pull-repo is not working #7

Closed
nrchandan opened this issue Mar 4, 2014 · 2 comments
Closed

LabManager's pull-repo is not working #7

nrchandan opened this issue Mar 4, 2014 · 2 comments
Labels
bug

Comments

@nrchandan
Copy link
Contributor

Pulling a repo for which a cache already exists seems to fail if labspec.json is modified in the upstream. Not sure if it fails for other changes also.

2014-03-04 04:52:59 PM - ovpl - DEBUG - LabManager.get_lab_reqs()
error: Your local changes to 'scripts/labspec.json' would be overwritten by merge. Aborting.
Please, commit your changes or stash them before you can merge.
@nrchandan nrchandan added the bug label Mar 4, 2014
@nrchandan
Copy link
Contributor Author

Confirmed that it doesn't fail if labspec has not changed in the source repository.

@nrchandan
Copy link
Contributor Author

Fixed the issue by resetting the working area before trying to pull.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
bug
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
1 participant
@nrchandan