Working copy GIT c two sources — how to correct?

0 like 0 dislike
4 views
As the version control system used all my adult life (I started to use it, so it started :) ) Subversion (aka SVN). Then turned up a project using the framework that is hosted on github and with git I have never worked. The customer asks the project to host on github, too, and even ready to constantly pay for it. In SVN it is immediately optimal deployment option not find, and then quite unfamiliar system, and you need to quickly. But this is prelude.

Actually a question in how competently to implement the situation when a single directory (framework) hosted in a single repository as a whole, except for one subdirectory (application) that is hosted in another repository. You need to:
a) the status of the framework (root directory of the project) not flashed application files (subdirectory), and the framework is normally made checkout from your repository file (.gitignore at the root of it is present and also should be updated normally, that is simply to place the app it will not work);
b) the status of the application flashed :) files relative to the repository application, ideally, the repository of the application was fully deployed framework with the app inside, but not as an external link, but as the project at the time of the commit

While comes to mind only to deploy the framework; copy everything except the git information in the parallel tree; there deploy the application. After updating the framework for checking out code, remove from copies of old (simple, overwrite will not go out of the framework files can disappear or be renamed), leaving only the app; copy new over top of the application; modify the application to the realities of the new version and committing it to the repository application. But somehow I feel this method is not like, very ugly. Maybe there are better options?
by | 4 views

3 Answers

0 like 0 dislike
by
0 like 0 dislike
If someone gets here from a search, here there is a detailed description
by
0 like 0 dislike
2 create a branch, and add 2 remote. Well, actually one branch is always the pushta in github, and the other where you need.
by

Related questions

0 like 0 dislike
6 answers
0 like 0 dislike
1 answer
0 like 0 dislike
1 answer
110,608 questions
257,186 answers
0 comments
1,120 users