In a git merge, how do you just replace your version with the version git says there is a conflict with?

If their is a conflict during a merging operation (merge, cherry-pick, rebase, etc…) you can resolve conflict by picking one side of the changes by doing :

git checkout --ours <path> (this will choose the local changes)

or

git checkout --theirs <path> (this will choose the remote changes)

then finishing resolving the conflict as usual with:

git add <path>

then commit with:

git commit