...
- Pros
- Combining all of the individual commits into a single commit makes viewing history cleaner/easier to read.
- Cons
- No explicit historical link between what's merged and the original commits from the branch
- The squash commit log contains the individual commit logs, but no linked reference back to the original commits
- May have more difficulty using git related tools and features
- git won't be able to tell if your local branch has been merged with your Master branch
- when building one branch from another branch
- when merging the second branch it will include the commit logs that have already been merged from the previous squashed branch.
- may have merge conflicts: for example thinking the same file was created in master and the second branch
- No explicit historical link between what's merged and the original commits from the branch
...