Git merge two overlapping repositories
===

I have this configuration:

    RepoA
      |-Dir1

    RepoB

The problem is that RepoB is copied and modified Dir1. Is there a way how to merge RepoB into RepoA without loosing history on RepoB?


Thanks