{"action":"closed","issue":{"url":"https://api.github.com/repos/boxen/our-boxen/issues/696","labels_url":"https://api.github.com/repos/boxen/our-boxen/issues/696/labels{/name}","comments_url":"https://api.github.com/repos/boxen/our-boxen/issues/696/comments","events_url":"https://api.github.com/repos/boxen/our-boxen/issues/696/events","html_url":"https://github.com/boxen/our-boxen/issues/696","id":52582997,"number":696,"title":"modules directory 'filled' after update","user":{"login":"tcooper","id":542846,"avatar_url":"https://avatars.githubusercontent.com/u/542846?v=3","gravatar_id":"","url":"https://api.github.com/users/tcooper","html_url":"https://github.com/tcooper","followers_url":"https://api.github.com/users/tcooper/followers","following_url":"https://api.github.com/users/tcooper/following{/other_user}","gists_url":"https://api.github.com/users/tcooper/gists{/gist_id}","starred_url":"https://api.github.com/users/tcooper/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/tcooper/subscriptions","organizations_url":"https://api.github.com/users/tcooper/orgs","repos_url":"https://api.github.com/users/tcooper/repos","events_url":"https://api.github.com/users/tcooper/events{/privacy}","received_events_url":"https://api.github.com/users/tcooper/received_events","type":"User","site_admin":false},"labels":[],"state":"closed","locked":false,"assignee":null,"milestone":null,"comments":6,"created_at":"2014-12-21T01:46:15Z","updated_at":"2015-03-22T18:39:28Z","closed_at":"2015-03-22T18:39:28Z","body":"Finally got a chance to fetch/merge upstream changes from `boxen/our-boxen` into `our-boxen` to get it working on Yosemite again... :+1: \r\n\r\nNot sure if/what I did wrong in applying updates to `our-boxen` while following the [FAQ](https://github.com/boxen/our-boxen/blob/master/docs/faq.md#q-how-do-you-upgrade-your-boxen-from-the-public-our-boxen) but after the update a number of directories have *appeared* in my `our-boxen/modules` directory that were not there before...\r\n\r\n```\r\n    tcooper@velox:~/src/our-boxen $ boxen\r\n    --> Preparing to auto-update...\r\n    --> Skipping auto-update, because you've got uncommitted changes:\r\n\r\n        ?? modules/adium/\r\n    ?? modules/boxen/\r\n    ?? modules/chrome/\r\n    ?? modules/cord/\r\n    ?? modules/dnsmasq/\r\n    ?? modules/dockutil/\r\n    ?? modules/foreman/\r\n    ?? modules/gcc/\r\n    ?? modules/git/\r\n    ?? modules/go/\r\n    ?? modules/homebrew/\r\n    ?? modules/hub/\r\n    ?? modules/inifile/\r\n    ?? modules/iterm2/\r\n    ?? modules/macvim/\r\n    ?? modules/module_data/\r\n    ?? modules/nginx/\r\n    ?? modules/nodejs/\r\n    ?? modules/openssl/\r\n    ?? modules/osx/\r\n    ?? modules/phantomjs/\r\n    ?? modules/pkgconfig/\r\n    ?? modules/repository/\r\n    ?? modules/ruby/\r\n    ?? modules/stdlib/\r\n    ?? modules/sudo/\r\n    ?? modules/textwrangler/\r\n    ?? modules/vagrant/\r\n    ?? modules/virtualbox/\r\n    ?? modules/xquartz/\r\n\r\n        Since you've got some uncommitted changes to those files, I'm\r\n        going to take the safe road and not automatically update anything.\r\n        If you're actively working on some Boxen, maybe you'd like to\r\n        switch to a branch, rather than working on master? This way I'll\r\n        know that you're trying something new, and won't do things like\r\n        automatically update, or submit issues, while you're making\r\n        changes. It makes everyone's life a bit easier :heart:\r\n\r\n        Now, if you *weren't* expecting any changes, here's how to get\r\n        back on the golden path:\r\n\r\n          cd /opt/boxen/repo\r\n          git reset --hard origin/master\r\n          boxen\r\n\r\n    For more info on how the simple git-based updates work, have a gander at\r\n    https://github.com/boxen/our-boxen/blob/master/docs/updates.md\r\n\r\n    Would you like to run Boxen anyway, without the latest updates? [y/N]\r\n    N\r\n\r\n    Ok, bailing out!\r\n```\r\nIn addition, my customized `modules/people` and `modules/projects` trees were removed and had to be restored (with `git checkout -- <bit-that-was-gone>`)... :-1: \r\n\r\nIs this expected? If so, where can I read about this changed structure? If not, can I just remove all those **new** modules?"}}