From 9cb2776064efd6fefbaa9367544e3a2c8ba02dc1 Mon Sep 17 00:00:00 2001
From: Hugh Saunders <hugh@wherenow.org>
Date: Mon, 20 Jan 2014 17:18:27 +0000
Subject: [PATCH] Remove Berksfile.lock from dev branches

blueprint remove-berksfile-lock-from-dev-branches

Change-Id: I4d9643b7739446943d648a7e9a6d4bb6e9ad0c63
---
 README.md | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/README.md b/README.md
index 4549cc0a..4874409d 100644
--- a/README.md
+++ b/README.md
@@ -180,6 +180,16 @@ Testing
 
 Please refer to the [TESTING.md](TESTING.md) for instructions for testing the cookbook.
 
+Berkshelf
+=====
+
+Berks will resolve version requirements and dependencies on first run and
+store these in Berksfile.lock. If new cookbooks become available you can run
+`berks update` to update the references in Berksfile.lock. Berksfile.lock will
+be included in stable branches to provide a known good set of dependencies.
+Berksfile.lock will not be included in development branches to encourage
+development against the latest cookbooks.
+
 License and Author
 ==================