git workflow: added pre-merge rebase instructions