> 1) - sounds good. Will it fast forward any changes if possible (or attempt merging at all) on demand? Is there a proposal re this? The stuff in Packages are actual clones, so you can manage your own merging. However I should think the default update command can try to do it for you, yes.