From 2d107568cc9bc8805c49eec55fc940f3866f19fb Mon Sep 17 00:00:00 2001 From: fschwiet Date: Thu, 25 Jul 2013 11:21:03 -0700 Subject: [PATCH] Update faq.md --- docs/faq.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/docs/faq.md b/docs/faq.md index 685103c..9a78697 100644 --- a/docs/faq.md +++ b/docs/faq.md @@ -9,3 +9,15 @@ When removing applications make sure to remove the corresponding `/var/db/.puppe ### Q: How do you remove Boxen? 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.