Wouldn't you get the same conflicts for both a rebase and merge in this instance? I'm curious to hear of a case in which it would better to merge staging updates into a feature rather than rebasing the feature on staging.