git rebase onto remote updates

Question

I work with a small team that uses git for source code management. Recently, we have been doing topic branches to keep track of features then merging them into master local

Answer 1

I have found, over time, my favorite solution is:

git checkout topic
# make [n] commits
git rebase -i HEAD~[n] #clean up time
git checkout master
git pull --rebase
git checkout topic
git rebase master
git checkout master
git merge topic
git push origin