git 压缩提交后将功能分支合并到主分支

Question

I have a feature branch with several commit messages, and the commit messages were squashed into a single commit when merging with the master branch. Now, I have made another change in the feature branch, and when I try to merge with the master branch, due to differences in the history, I can see all the changes and commits that were squashed.

How can I merge the feature branch with the master branch while preserving the squashed commits?

Answer 1

If I undertand you correctly you can achive what you want using merge with --no-ff key but not --squash This will allow you to have following structure