git workflow: added pre-merge rebase instructions

This still doesn't cover versioning - that can be a separate PR.