Page MenuHomePhabricator

Labs instance doesn't get MCS Git repo updates
Closed, ResolvedPublic

Description

The labs instance doesn't get updates anymore.
Looks like the puller script doesn't update the git repo since there is a local modification to the config.dev.yaml file.

head /var/log/puller
Already on 'master'
M	config.dev.yaml
Your branch is behind 'origin/master' by 9 commits, and can be fast-forwarded.
  (use "git pull" to update your local branch)
error: Your local changes to the following files would be overwritten by merge:
	config.dev.yaml
Please, commit your changes or stash them before you can merge.
Aborting
Updating b29f70c..ed0e2e4
[...]

Not sure why there are local modifications to this file on the labs machine.

Event Timeline

mobrovac claimed this task.
mobrovac edited projects, added Services, User-mobrovac; removed RESTBase.
mobrovac subscribed.

Cleaned it up, now it's back and working.