I have two branches, 'master' and 'work'. 'master' I never work out of, and I merge changes into it from another SVN repository (I do not use git-svn, I do this all by hand as real git commits). My 'work' branch is technically my 'master' in the git-trunk sense, as that is my personal main line of development and I merge directly to 'master' from 'work'. I like to rebase 'work' onto 'master' but by doing so, I have to 'git push --force origin work' due to the fact that the rebase puts my current branch behind origin/work.
Should I stick to merging between 'master' and 'work' only ? Rebase is only for local-only branches, right?