How to bring one branch into exact correspondence with another?

Question

git

The repository has (among others) 2 branches, one is a complete mess and the other (master) is clean.
How to bring a branch with a mess into exact correspondence with the master. You can't rebase - there will be conflicts during deployment. I thought about how to make and apply the differences to the master branch, but I could not find the necessary commands.

Answer 1

git checkout bardak
git diff bardak master | git apply

Answer 2

Kill the mess with the master. Resolve conflicts.