Rebase on pull and highlight whitespace