Databases
StackOverflow2013
Postsdbo
PO
 

Note that there are some explanatory texts on larger screens.

plurals
  1. PO
    primarykey
    data
    text
    <p>I haven't found submodules to be particularly useful on the (small) projects I've worked on. Once you've set them up, working on the whole project requires adding additional parameters to almost every command and the syntax isn't completely regular. I imagine if I worked on larger projects with more submodules, I'd see it as a more beneficial tradeoff.</p> <p>There are two possibilities that keep the sub-projects as independent git repos that you pull from into your main (integration) repo:</p> <ul> <li><p>Using <strong>subtree merge</strong> <a href="http://www.kernel.org/pub/software/scm/git/docs/howto/using-merge-subtree.html" rel="noreferrer">to bring your external projects into separate subdirectories</a> in your main repo that includes your core files. This makes it easy to update the main project from the external projects, but complicated to send changes back to the external projects. I think of this as a good way to include project dependencies, but it wouldn't work so well with shared files. <a href="http://nuclearsquid.com/writings/subtree-merging-and-you" rel="noreferrer">Another simple explanation (link fixed)</a>.</p></li> <li><p>Set up each <strong>project as a remote branch</strong> in your main repo and merge from each of them into your <code>master</code> (integration) branch that also contains your core files. This requires some discipline: if you make any changes to the external projects in your main repo, they must be made in the branch and then merged into the master; and you never want to merge into the project branches. This makes it easy to send changes back to the external projects and is a perfectly acceptable use of branches in Git.</p> <p>Your shared scripts can be handled as another independent branch in your main directory which your external partners can pull from and push to as a remote branch.</p></li> </ul> <p>If you try to run SVN &amp; Git in the same directory, you make it very hard to use branching in either system, because SVN does branching by copying file directories while Git tracks pointers. Neither system would automatically see branches you make in the other. I think that 'solution' is more trouble than it is worth.</p>
    singulars
    1. This table or related slice is empty.
    1. POProjects within projects using Git
      singulars
      1. PTQuestion
    1. PTAnswer
    1. USJoshua C. Lerner
    1. USPaul
    plurals
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. POProjects within projects using Git
      singulars
      1. PTQuestion
    1. This table or related slice is empty.
    1. VO
      singulars
      1. PO
      1. This table or related slice is empty.
      1. VTUpMod
    2. VO
      singulars
      1. PO
      1. This table or related slice is empty.
      1. VTUpMod
    3. VO
      singulars
      1. PO
      1. This table or related slice is empty.
      1. VTAcceptedByOriginator
    1. COAfter too much time trying, I still can't get your second method to work. Setting up the branch and merging it in was OK, but beyond that I'm lost. Would it be possible to describe a more complete workflow? Would it be proper to ask this as its topic and start a new thread?
      singulars
      1. PO
      1. USSamGoody
    2. COWhat are you trying to do that you can't? Basically you are creating vendor branches, which are fairly common in svn. (Actually 'vendor branch' seems to have two different uses -- an included repo from a vendor like you want, or a release branch for a specific vendor.) I'm traveling with very little net access, but will try to get something more written for this.
      singulars
      1. PO
      1. USPaul
    3. COI started a new thread on the subject at http://stackoverflow.com/questions/769786/vendor-branches-in-git, please excuse my obvious frustration there. Thanks very much.
      singulars
      1. PO
      1. USSamGoody
 

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