Git合并成主节点而忽略冲突

Question

我有两个分支：开发和掌握。我想将开发合并为大师。当我关注

git checkout develop
git pull origin develop
git checkout master
git merge develop
git push origin master

Git吐出类似错误消息

CONFLICT (content): Merge conflict in CHANGELOG.TXT

如何告诉git将所有内容从开发转移到掌握所有冲突？