CODEWITHSUNDEEP
git
Peter Aba
Peter Aba

Reputation: 31

including several git projects in one, simple example

I know this must have been asked multiple times, but I can't really find it, and after actually rtfm, I felt I may even ask something that also helps others.

Scenario, Magento delevopment, let's say I want to build a custom e-commerce website with an almost latest core and html5 and just for the hack of it, throw in DISQUS too.

We have 3 projects on github to handle these:

These moduls will partially conflict, as they can all have folders in their project root called app, lib, skin, few others, but they are unlikely to contain the same files in the exact same folders.

My question is, what is the best way to set up my project to be able to upgrade when these projects upgrade?

Thanks in advance!

Upvotes: 1

Views: 67

Answers (1)

VonC
VonC

Reputation: 1323453

To keep a link between your project and those three components you need, I would recommend referencing them as submodules.

However, as explained in this question, I would recommend keeping separate:

  • your project tree as stored in Git (and visible in your Git local working tree)
  • your project actual structure (ie the one you need for your project to run)

The second one should use symlinks to the first one content, in order to work with the right files in app, lib, skin, while allowing those same directories to be kept separate in the original git submodules.

Upvotes: 2

Related Questions