title: git How to merge a branch into the master branch by completely overwriting master branch
body: <p>I started work on the <b>master</b> branch. Almost one year ago, I created another branch <b>dev</b> in which I made some changes. From that time on I continued work on dev branch. Now I want to merge dev into master which results in lot of conflicts. I want to merge dev into master by overwriting master branch's contents i.e. for any conflict that arises I want to keep dev branch's version of the code. How can it be done ?</p>