Git merge errors

Question

I have a git branch called 9-sign-in-out with perfectly working code, and I want to turn it into the master. I\'m currently on the master branch.

Answer 1

Change branch, discarding all local modifications

git checkout -f 9-sign-in-out 

Rename the current branch to master, discarding current master

git branch -M master