From 3e8dac189c1917f3dad4b0aa275c1a5665d6f2bd Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Thu, 20 Mar 2014 14:37:15 +0100 Subject: warn against squashing non-feature branches, for example the master branch MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mattias Andrée --- using-git.texinfo | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/using-git.texinfo b/using-git.texinfo index 600b09c..c84529b 100644 --- a/using-git.texinfo +++ b/using-git.texinfo @@ -1461,8 +1461,14 @@ Try to avoid commit squashing were the squash top is not the tip of a commit chain. It will probably lead to merge conflicts and you will -have interate the process for -subsequent commits. +have interate the process for subsequent +commits. Additionally, it is a bad idea +to squash branches other as working, +this includes you default branch +(usually called @code{master}). You +should always assume that others are +working on public branches that feature +branches. -- cgit v1.2.3-70-g09d2