Yes, if you're going to rebase, rebase your feature branch. Do not do it on the shared staging/dev etc.