What's the best way to do 2-way syncing between branches that are *not* identical (i.e. some of the patches should not be sync'd)? Stefan