##git rebase
is actually pretty neat and easy and now i wonder why on earth i have been rebasephobia!
If you were like me (lol), this might change your mind, you will love it absolutely!
git rebase staging/master
//rebase against the branch you normally would commit to
//the files that have conflicts will be listed. resolve them and
git rebase --continue
// be sure you resolved all conflicts then git add
git add .
// i prefer adding the files one at a time but you can add all too
git commit -m "commit msg"
git push origin branchname
Thats all folks!