Distinguish between changes-since and local-changes