git - How to merge branch into master with accepting branch's changes -

i have tried rebase , merge both of them introduce conflicts me solve. master branch old , want override files ready branch.

i have following branches:

-- master
-- ready

i want merge ready master master clone of ready.

i not want solve conflicts, actually, want files overridden not merged.

note:

i have tried deleteing local master , renaming ready master not push remote repo hosted @ bitbucket, bitbucket not allow deletion of master branch. stuck merge

if want override master branch, force push new cloned master ready:

$ git checkout ready $ git branch -d master      // delete old master $ git checkout -b master    // create new master $ git push -f origin master // force push master br 

---

suggestion: better backup old master before force override in case need refer in feature.