How to update production server without conflicts, git ?

Question

git

Actually, this question arose:
I work through git and I have 2 branches, these are development and master. When they send me the code, it is merged into development and conflicts are eliminated. Next, I update the master and push everything to the git server.
Now I want to update the main server:
git pull
but sometimes there are conflicts somewhere in the files that I may not notice or forget for them and this will put a piece of the system.
Can you please tell me whether it is possible to update the main server not with a merge, but with a replacement? That is, so that conflicts do not arise, but files are simply replaced?

Answer 1

git pull --rebase

Answer 2

git checkout -- && git pull

Answer 3

Didn't quite understand your situation, but it's likely that something like
git push origin master --force will help you