How to merge a branch into another with override option in git

Question

I use git and I have two branches: production and master. At this time, production is 9 months, and many changes have passed into the main industry.

I use capistrano, so I need to push all the changes in the production branch so that I can deploy. However, when I merge, I get tons of merge conflicts. I am not interested in the merge problem because I want my production branch to be redefined by the master branch. Is there any way to do this.

If I had not thought about creating a production branch called production_old. Then delete everything in the production branch, and then merge from the wizard.

I am using github.

Answer 1

, ours - , .

, , . .

... http://www.kernel.org/pub/software/scm/git/docs/git-merge.html

Answer 2

: github. ...

, . , , (production), , , (master), master production.

, , , , .

• production, .
• production, master.

, №2, git branch -f production master, production, master . production , -f. git checkout production, git reset --hard master, master.

, production, - , , , .