« first day (3878 days earlier)      last day (31 days later) » 

4:22 AM
I have a 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?
 
 
7 hours later…
 
3 hours later…

« first day (3878 days earlier)      last day (31 days later) »