如何用Remote上的Develop Branch替换Master Branch文件？

Question

I have an out dated Master Branch contains committed files with unresolved conflicts, and i have a Develop Branch that contains the latest code with no problem.

How can I replace my master branch files with files in develop branch?

Please advise...

Answer 1

Assuming you want to just wipe out what you have on master and make it be identical to develop ...

reset your master branch to point to the same commit as develop :

git checkout master
git reset --hard develop
git push -f origin master