rebasing.txt

$ git rebase -i master

# if conflict
 # see which files are conflicted
 $ git status 

 # fix it and do:
 $ git commit -a

# then if it's all good
$ git rebase --continue

# When it's done do:
$ git push --force

# if all goes to hell
 $ git rebase --abort
 
 
--------

git checkout master
git pull origin master
git checkout brancher/test
git rebase master
git push origin brancher/test --force
git checkout master
git merge brancher/test
git push origin master