Simple suggestion: Don't change the old code. Copy the old method and then rename the old method. Refactor the copied code. Diff will only mark your 'newly adde

Simple suggestion: Don't change the old code. Copy the old method and then rename the old method. Refactor the copied code. Diff will only mark your 'newly added' code which will check in without conflicts. Later remove the old method.