From: Emily <lingyan.ren@gmail.com>
Date: Mon, 07 Nov 2011 14:54:18 GMT
Subject: how to merge sub directory or file?
Message-ID: <8B3D19E0-2181-4E9C-943F-CA26A399E0D9@gmail.com>
In-Reply-To: <20111107172652.0faade61@ashu.dyn.rarus.ru>

Hi,

I have two git projects A and B, content of B is subset of A. For example, Project  A and B's tree are as below:

A
--- dir1
--- dir2
--- dir3
       |---file1
       |---dir4
       |---dir5
--- dir6
--- dir7

B
--- dir1
--- dir3
      |--- file1
      |--- dir4

When there's new changes in project A, how can I merge them to project B without changing B's directory structure?

Your help will be highly appreciated.

Thanks,
Emily