Saving small changes before a merge with remote