I intentionally avoid fetch and rebase because you can pull and merge instead