atomaka/my-boxen
1
0
Fork 0
Code Releases Activity

Merge pull request #372 from fschwiet/patch-1

Browse source 
Update faq.md based on question
This commit is contained in:
Adam Ochonicki 2013-11-02 10:26:58 -07:00
commit 35139159f5
1 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
docs/faq.md
View file

@ -9,3 +9,15 @@ When removing applications make sure to remove the corresponding `/var/db/.puppe
### Q: How do you remove Boxen? ### Q: How do you remove Boxen?
Run `script/nuke` from inside the `/opt/boxen/repo` directory. Run `script/nuke` from inside the `/opt/boxen/repo` directory.
### Q: What's a good approach to merging our-boxen back into my private fork?
One approach is to delete the Gemfile.lock and Puppetfile.lock and run:
# Regenerates Gemfile.lock and installs new Gems
bundle install --without development
# Regenerates Puppetfile.lock and caches tarballs
bundle exec librarian-puppet install --clean
These will generate the respective lock files suitable for committing. Hope that helps.