Merge a Git repository with a sub directory of remote Git

Question

I have a Git repository and everything is on root, but on remote git repository the desired content is one level deep (there are three types of folder 1-git folders 2-DemoProject 3.some-other-folder-i-have-no-concern). How to merge these two together. Even though they are completely disconnected but i have found the way to merge the disconnected repository but this level thing isn't working.

LocalBranch(DemoProject)
     -(git folders)
     -Content1
     -Content2

Remote Branch
      -(git folders)  
      -DemoProject
         -Content1
         -Content2
       -Some Folder

It would help if the remote repo would split DemoProject into its own repo and reference it through a submodule entry. Do you have the possibility to split that remote repo in two? Or don't you have any access/control over that remote repo? — VonC
– VonC, Commented Feb 6, 2014 at 9:54
i have updated the question but no its going to be same. some documents and old stuff is there too. — Waqas
– Waqas, Commented Feb 6, 2014 at 10:10

Community · Accepted Answer · 2017-05-23 12:03:47Z

0

One way would to:

clone the remote repo
reorganize (in a dedicated branch) its content in order to reflect your own repo
push that dedicated branch

Then, following "How to combine two separate unrelated Git repositories into one with single history timeline", you can combine the history of your repo on top of the remote repo (which, on that special branch, contains the right structure).

edited May 23, 2017 at 12:03

CommunityBot

11 silver badge

answered Feb 6, 2014 at 13:04

VonC

1.4m569 gold badges4.8k silver badges5.7k bronze badges

Sign up to request clarification or add additional context in comments.

2 Comments

Waqas Over a year ago

but when you push it will change the remote structure as well, won't it.. That we can't do

VonC Over a year ago

@Waqas it will change the structure on a dedicated branch only, so it shouldn't have any visible impact.

Collectives™ on Stack Overflow

Merge a Git repository with a sub directory of remote Git

1 Answer 1

2 Comments

Your Answer

Linked

Hot Network Questions

Collectives™ on Stack Overflow

1 Answer 1

2 Comments

Your Answer

Sign up or log in

Post as a guest

Linked

Related