From 0305426b63fd527ec942e10b87686ac909a26cce Mon Sep 17 00:00:00 2001
From: Henrik Skov Midtiby <hemi@kbm.sdu.dk>
Date: Sat, 24 Nov 2012 22:58:33 +0100
Subject: [PATCH] Added notes about how to handle feature branches and merging
 of these.

---
 gitnotes | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 gitnotes

diff --git a/gitnotes b/gitnotes
new file mode 100644
index 0000000..9ed5750
--- /dev/null
+++ b/gitnotes
@@ -0,0 +1,3 @@
+merge of feature branch with master
+git checkout master
+git merge --no-ff FeatureBranch