如何在git上从master添加一些特定的提交到另一个分支

I've this work flow with git. origin/master is 7 commits ahead of my branch "crazy-work" and crazy-work has 10 new commits. Now I want to merge crazy-work to origin/master. What is the best way to do this with minimal conflicts. even if there any conflict occurs choose the crazy-work branch's files as selected work. note that the branch crazy-work has the updated and stable source code.I've this work flow with git. origin/master is