Re: How to deal with both git trees