Stefan writes: > when a config file has been changed locally, it's unable to merge the > local change with the upstream change: There is no general way to do this. The system would have to fully understand the config file and know all the ways the changes could conflict and interfere. -- John Hasler