How to bring the changes from the master branch to my current branch
Move you changes to your new branch from master
make your changes on master
creat new branch my_branck and checkout the new branch
git add .
git checkout my_branch
git checkout master
to make sure your master is clear `git clewan -f`