How to move the current working branch to master branch in git - Stack Overflow: "Firstly, I would try just merging it to master and seeing if there really are lots of conflicts - git's merging is great at only marking genuine conflicts. If you make sure that your git status is clean before you start, and you find that there are too many conflicts to deal with, you can just go back with:
git reset --merge
However, if you just want to make your current master the same as your other branch, you could do that with:
git checkout master
git reset --hard other-branch
However, that's generally a bad idea since:"
'via Blog this'
No comments:
Post a Comment