Databases
StackOverflow2013
Postsdbo
POCombining Multiple Sites into a single Git Repo
 

Note that there are some explanatory texts on larger screens.

plurals
  1. POCombining Multiple Sites into a single Git Repo
    primarykey
    data
    text
    <p>Here's my problem. The company I work for started off with a single website, based on osCommerce (well before I came along). Site grew, they started a second by copying the first, and modifying it where necessary. This continued over the years, to where we now have five separate sites, all based on the same code. When we make a change to one site, I currently have to manually copy those changes to all the other sites code, and upload all the changed code to each of the sites.</p> <p>This is highly inefficient, and is driving me crazy. I know that Git is pretty much designed to solve such problems. At present, I have each site as it's own Git repo, but I'm still forced to copy modifications from one to all the others. I'm also pretty new to Git. I get commits, branches, pulls, etc. but otherwise am pretty green.</p> <p>Is there anyway that I can combine all of these sites into one single repo, and how would I do so? I also should point out that the files across each site are not necessarily identical. One site is considered a priority, so some changes have been made there in emergencies that weren't rolled out to the other sites, and another one is run in a slightly different fashion than the other 4, so it's code differs slightly in some places. I realize that this will cause conflicts, but I'd like to be able to find all of the conflicts, resolve them so the system works as intended, and have any variations be database/options driven. The boss wants to roll out at least another 2 sites in a couple of months, so at that point I'll be truly losing my mind.</p> <p>Is what I'm wanting even possible? Will it require me going through each and every file to resolve conflicts? Any help is much appreciated!</p>
    singulars
    1. PO
      singulars
      1. PTAnswer
    1. This table or related slice is empty.
    1. PTQuestion
    1. This table or related slice is empty.
    1. USnathangiesbrecht
    plurals
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. PO
      singulars
      1. PTAnswer
    1. VO
      singulars
      1. POCombining Multiple Sites into a single Git Repo
      1. This table or related slice is empty.
      1. VTUpMod
    2. VO
      singulars
      1. POCombining Multiple Sites into a single Git Repo
      1. This table or related slice is empty.
      1. VTUpMod
    1. COPutting unrelated files in the same repository, even with shared code, isn't a good idea. You will have their histories combined, restricting devs to some repositories would be almost impossible, etc. The most intelligent approach would be making a repo for the shared code **and** each site, and use `git submodule` to include the shared code to each site. In this case your shared code needs to be completely decoupled from any specific site.
      singulars
      1. POCombining Multiple Sites into a single Git Repo
      1. USKurzedMetal
 

Querying!

 
Guidance
A row detail

Detail views are divided into sections. All the information in the data section comes from columns in the selected row. The other sections display data from other, related rows.

Related data can be related in a to-one or a to-many fashion. Captions of data related in a to-many fashion link to a list view showing a filtered view of the table.

Try moving around until you find a non-empty to-many entry and click on the label to get to one. You can move back to the root by clicking on the database name in the header.

SQuiL has stopped working due to an internal error.

If you are curious you may find further information in the browser console, which is accessible through the devtools (F12).

Reload