Note that there are some explanatory texts on larger screens.

plurals
  1. PO
    primarykey
    data
    text
    <p>What you really should do is create a "template" branch/repo which contains the common code. You then branch the customized repos from that template branch. When you make changes to the template, you can merge them into the customized repos.</p> <p>Now, since you already have the other repos present, you have to fudge the changes in. Basically create a template repo with the non-customized changes which all repos have been manually updated for. Then add the customized repos as remotes to this template repo <code>git remote add customized1 URL</code> and checkout the appropriate branch <code>git checkout -t -b customized1-master customized1/master</code></p> <p>Then do a "fake" merge from the template's master into each customized master:</p> <pre><code>for f in customized1 customized2; do git checkout $f-master git merge -s ours master git push $f $f-master:master done </code></pre> <p>You of course may check to see what it did before doing the push.</p> <p>At this point you have injected your template branch as a relevant ancestor to your customized repos/branches. You can then make a change to your template branch (called master in my example in this new repo) and after committing, do a real merge:</p> <pre><code>for f in customized1 customized2; do git checkout $f-master git merge master git push $f $f-master:master done </code></pre> <p>You almost certainly want to inspect what happened before you push this time. Now, changes to the template can be easily shared with all customized repos. Also if you need a new customized repo, you can branch it from the template branch.</p>
    singulars
    1. This table or related slice is empty.
    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. VO
      singulars
      1. This table or related slice is empty.
    2. VO
      singulars
      1. This table or related slice is empty.
    3. VO
      singulars
      1. This table or related slice is empty.
 

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