From 9aba028c6355fe38fcd82813b394496240662971 Mon Sep 17 00:00:00 2001
From: Daniel Leavitt <daniel.leavitt@gmail.com>
Date: Thu, 8 Sep 2011 22:20:36 -0700
Subject: [PATCH] Added a note about YAML merges and Psych. Your library is hardly the only one affected, but I thought it might be worth noting.

---
 README.rdoc | 6 ++++++
 1 file changed, 6 insertions(+), 0 deletions(-)

diff --git a/README.rdoc b/README.rdoc
index 4be7030..3e72393 100644
--- a/README.rdoc
+++ b/README.rdoc
@@ -65,6 +65,12 @@ Using a namespace allows us to change our configuration depending on our environ
   production:
     <<: *defaults
 
+_Note_: Certain Ruby/Bundler versions include a version of the Psych YAML parser which incorrectly handles merges (the `<<` in the example above.) 
+If your default settings seem to be overwriting your environment-specific settings, including the following lines in your config/boot.rb file may solve the problem:
+
+  require 'yaml'
+  YAML::ENGINE.yamler= 'syck'
+
 === 3. Access your settings
 
   >> Rails.env
--
libgit2 0.21.0