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

Moved Upgrading instructions to FAQ

Browse source
This commit is contained in:
Blaine Morgan 2014-05-16 16:03:17 -07:00
parent bace1f5def
commit ff9161ec73
1 changed files with 1 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
README.md
View file

@ -316,41 +316,7 @@ You'll still be the maintainer, you'll still own the issues and PRs.
It'll just be listed under the boxen org so folks can find it more easily.
##upgrading boxen
distilled from http://grahamgilbert.com/blog/2014/04/04/updating-boxen/
As Boxen is made by GitHub, updating it is much like updating any other project on there that you’ve made a fork of. First we’re going to add it as a remote repository:
```bash
cd ~/src/our-boxen
git remote add upstream https://github.com/boxen/our-boxen.git
```
Then we’re going to fetch the stuff from the upstream repository:
```bash
git fetch upstream
```
Now we’re going to merge the updated repository with our own:
```bash
git checkout master
git merge upstream/master
```
Now deal with conflicts in (Puppetfile, manifests/site.pp), ignore any diffs in Puppetfile.lock and Gemfile.lock.
```bash
git mergetool
```
The next step is to update your Puppet modules and RubyGems. First delete Puppetfile.lock and Gemfile.lock. Now go back to your trusty Terminal and:
```bash
rm Puppetfile.lock Gemfile.lock
bundle install --without development
bundle exec librarian-puppet install --clean
```
See [FAQ-Upgrading](https://github.com/nbmorgan/our-boxen/blob/master/docs/faq.md#q-how-do-you-upgrade-your-boxem-from-the-public-our-boxen).
## Integrating with Github Enterprise