How about ‘accept this change’ and ‘keep current version’. As long as there is a clear indication of the changes it should be ok. Currently I try to remember it as ‘red is ready to come in, blue is about to be blown away’.

tim
--
tim Rowledge; tim at rowledge.org; http://www.rowledge.org/tim
Oxymorons: Resident alien