How to return the Master branch to the current state?

Question

git

There are 2 branches master and feature-xxx.
The feature branch contains the actual code that needs to be transferred to master. There is no working code in master.
I did

git checkout master
git merge feature

The master still has non-working code.
How do I completely copy the code from feature to master?

Answer 1

Go to master
Here is optional. We take the latest changes.
We get up on the last commit of the feature branch
However, after such manipulations, you will have to force push:
git push --force origin master.
When you merged a feature, you just migrated delta changes between master and feature.