Rebasing your branch with the master/release branch is fine as long as there is coordination. I much prefer rebasing as it keeps the history clean. Also, you're more than okay to rebase your branch with remote, providing your commits haven't been pushed yet (i.e. git rebase origin HEAD).