Note that there are some explanatory texts on larger screens.

plurals
  1. USSamGoody
    primarykey
    data
    text
    plurals
    1. COYour answer: If the projects are interdependant, subtree-merge. Otherwise use submodules. I need to avoid both subtrees and submodules (see question), and would rather address this need without arguing too much if the approach is justified. In my case the larger project must include the subproject but not vice versa. The original thread listed issues with submodules - primarily that GitHub's download doesn't include them (vital to me) and that they get stuck on a particular commit. Any ideas?
      singulars
    2. COOn a personal note - ..You say "I'm not a Git guru" - I notice that your answer is the accepted answer on virtually every Git related Q' on the site. I do very much appreciate your help. .."VonC (who usually thinks things thru very thoroughly)" - I should think so. How the heck does someone get 25,000+ points in a site with contributions from world experts?! I'm in awe! I appreciate his help as well. You guys rock. Now, if just I can get this to work... :)
      singulars
    3. CO"..I'd use two Git repos" - I'm trying this, but (me the newb) am having trouble understanding. From this post I gather that to update the vendor project, I should subtree-merge their latest commits to the parent, create a branch of the parent called "vendor", and make my changes. They than pull in those changes from my "vendor" branch into their project. I didn't realize this was doable, and don't understand the point in making it a branch. Also didn't the other post avoid a subtree-merge?
      singulars
 

Querying!

 
Guidance

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