From: Travis Cross <tc@traviscross.com>
Date: Thu, 18 Sep 2014 20:02:19 +0000 (+0000)
Subject: Document policy against merges in a feature branch
X-Git-Tag: v1.4.8^2~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=58110da8709b41bcd7642b3ccd7cdaa1a6863a38;p=thirdparty%2Ffreeswitch.git

Document policy against merges in a feature branch
---

diff --git a/docs/SubmittingPatches b/docs/SubmittingPatches
index 51d207b779..1cbcc08d95 100644
--- a/docs/SubmittingPatches
+++ b/docs/SubmittingPatches
@@ -129,6 +129,17 @@ If you believe your patch resolves the issue in question, follow the
 issue number with a space and the "#resolve" directive as in the
 example above.
 
+Avoid Merges
+------------
+
+When you've created a local git branch to make and test your changes,
+it can be tempting to merge that branch periodically against our git
+HEAD, particularly if the branch lingers for some time.  Don't do
+this.  Instead, please rebase your branch onto our tree before
+submitting the commits to us.  Random "update branch to master" merges
+make our history hard to understand and make it more difficult to
+isolate regressions with `git-bisect`.
+
 Do As We Say...
 ---------------