Question

I am using git and I have two branches: production and master. At this time production is 9 months old and a lot of changes have gone into master branch.

I am using capistrano and so I need to push all the changes to production branch so that I could deploy. However when I merge I get tons of merge conflicts. I don’t care about merge issues because I want my production branch to be overridden by master branch. Is there a way to do it.

If not I was thinking of creating a branch of production called production_old. Then delete everything in production branch and then merge from master.

I am using github.

Answer 1

Maybe the ours merge strategy is what you are looking for.

ours
This resolves any number of heads, but the resulting tree of the merge is always that of the current branch head, effectively ignoring all changes from all other branches. It is meant to be used to supersede old development history of side branches.

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