master and a dev branch, and I want to merge dev to master fully, such that master is identical to dev in terms of files, but all the commits are squashed. However, when I do it with git commit --squash dev, it often raises some merge conflicts but I just want to make master a squashed replica of dev. How do I squash and merge like I want?
