git merge and git merge — squash

The difference between merge options.

Photo by Yancy Min on Unsplash

My story

I had a problem today when I merged my feature branch into master branch. This is the story. After I had finished implementing a certain feature, my boss odered me to merge it into master branch. There were a few difference between master branch and my feature branch. On the feature branch I pull master…