Category "revert"

How to merge a development branch into the master and ignore the changes in the master?

following situation: I made some changes in the development branch ( commit f + g ). Unfortunately, there were some changes in the master branch (commit e + d),