Git: move changes off of master branch

Question

Basic question but this happens to me all the time:

• Make changes in a working-branch
• Switch to master
• git merg

Answer 1

I used for similar cases:

git branch -f 
git checkout 

or

git checkout -B 

.

Both variants move the branch branch-name to your current commit with out reseting-hard your tree.