I tried to document basic workflow for rebase here: https://github.com/micropython/micropython/wiki/DevelWorkflow