diff options
| author | Mattias Andrée <maandree@operamail.com> | 2014-03-20 14:37:15 +0100 |
|---|---|---|
| committer | Mattias Andrée <maandree@operamail.com> | 2014-03-20 14:37:15 +0100 |
| commit | 3e8dac189c1917f3dad4b0aa275c1a5665d6f2bd (patch) | |
| tree | b975ec7123cfe8c3f110c6b051077a2d4fa5e745 /using-git.texinfo | |
| parent | explain why you should not squash non-tips (diff) | |
| download | using-git-3e8dac189c1917f3dad4b0aa275c1a5665d6f2bd.tar.gz using-git-3e8dac189c1917f3dad4b0aa275c1a5665d6f2bd.tar.bz2 using-git-3e8dac189c1917f3dad4b0aa275c1a5665d6f2bd.tar.xz | |
warn against squashing non-feature branches, for example the master branch
Signed-off-by: Mattias Andrée <maandree@operamail.com>
Diffstat (limited to 'using-git.texinfo')
| -rw-r--r-- | using-git.texinfo | 10 |
1 files 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. |