If Master has diverged since the feature branch was created, then merging the fea - ture branch into master will create a merge commit. This is a typical merge.

People may use merge commits to represent the last deployed version of production code. That’s an antipattern. Use tags.