GIT：在合并时使用Feature分支覆盖Current分支中所有冲突文件的命令

I am getting a conflict with merging my "feature" branch into my "current" branch and would like to know the easiest way to tell git to proceed by ignoring the merge conflict in the listed files and overwrite the files (...file1.ext, file2.ext...) on the "current" branch with the files on the "feature" branch. I am not interested in looking at the actual contents of the files through a text editor to see where the conflict is occurring. I simple want to run a GIT command that overwrites them with their new versions on the "feature" branch and gives me a new "current" branch with the changes from "feature". I've run the following so far:I am getting a conflict with merging my "featur