git - how to reset develop branch to master -
i have develop & master branches, develop branch messy , reset , make copy of master . i'm not sure if merging master develop make both of them identical. after trying merge got many conflicts solved them using: git checkout develop git merge origin/master //got many conflicts git checkout . --theirs is enough develop branch identical copy master ? thanks if want make develop identical master , simplest way recreate pointer: git branch -f develop master or, if have develop checked out: git reset --hard develop master note both of these options rid of history develop had wasn't in master . if isn't okay, preserve instead creating commit mirrored master 's latest state: git checkout develop git merge --no-commit master git checkout --theirs master . git commit