Thank you for replying.
Would it not be possible to merge only subdirectories, e.g. with git sparse checkouts.
I also think this one time, but it seems git merge is the process for all directory tree so it cannot devide by subdirectory by sparse-checkout.
// If I can ignore/ovewrite git history, There are many way of pulling upstream changes. But it will be difficult to trace changes.