diff options
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. |