Clean the project before checkout/update, use rebase instead of merge.