Skip to content
This repository was archived by the owner on Jan 20, 2022. It is now read-only.
This repository was archived by the owner on Jan 20, 2022. It is now read-only.

Subtree? #40

Closed
Closed
Subtree?#40

Description

@snostorm
snostorm
opened on Mar 13, 2015

Avec iojs-no, nous testons "git subtrees". Cela nous laisse pousser / tirer de leur repo à content/no en iojs/website.

nodejs/iojs.org#136 (comment) - détails techniques

Est le groupe français prêts à essayer ce trop?

(en: I've been testing git subtrees for linking content between iojs-no and their content/no folder in the https://github.com/iojs/website repo. Any interest in helping us test this approach?)

Activity

  1. yoannmoinet commented on Mar 14, 2015

    @yoannmoinet
    yoannmoinet
    on Mar 14, 2015
    Contributor

    Ok, ça m'a pris du temps pour comprendre 😄
    Ce serait effectivement une bonne idée.
    Je suis pour 👍

  2. podefr commented on Mar 16, 2015

    @podefr
    podefr
    on Mar 16, 2015
    Contributor

    je n'ai pas d'expérience avec git subtree mais ok pour essayer!

  3. Nicolab commented on Mar 16, 2015

    @Nicolab
    Nicolab
    on Mar 16, 2015
    Contributor

    Ok aussi

  4. snostorm commented on Mar 17, 2015

    @snostorm
    snostorm
    on Mar 17, 2015
    ContributorAuthor

    Je ai ajouté une nouvelle branche: https://github.com/iojs/iojs-fr/tree/website

  5. snostorm commented on Mar 17, 2015

    @snostorm
    snostorm
    on Mar 17, 2015
    ContributorAuthor

    Aussi #44 pour le premier changement

  6. snostorm commented on Mar 17, 2015

    @snostorm
    snostorm
    on Mar 17, 2015
    ContributorAuthor

    On https://github.com/iojs/website I ran this and pushed to master:

    git rm -fr content/fr
git commit -m "Removes content/fr to allow for subtree"

git remote add -f iojs-fr git@github.com:iojs/iojs-fr.git
git merge --squash -s ours --no-commit iojs-fr/website
git read-tree --prefix=content/fr/ -u iojs-fr/website

git commit -m "Adds iojs-fr content from iojs/iojs-fr#website"

    Now if we want to create a PR with new changes on iojs/website (either from the real branch or your own fork) given the latest version of https://github.com/iojs/iojs-fr/tree/website

    git fetch iojs-fr website
git pull --squash -s subtree iojs-fr website
git commit -m "Updates iojs-fr content from iojs/iojs-fr#website"

    Note: this assumes you've locally run git remote add -f iojs-fr git@github.com:iojs/iojs-fr.git otherwise you'd need to refer to a non-aliased git path or your own local reference.

  7. Nicolab commented on Mar 18, 2015

    @Nicolab
    Nicolab
    on Mar 18, 2015
    Contributor

    @snostorm Excellent, thank you very much! 🎅

  8. snostorm commented on Mar 18, 2015

    @snostorm
    snostorm
    on Mar 18, 2015
    ContributorAuthor

    Glad to help. Next step is probably to document this somewhere (especially the "making a PR" steps)

  9. yoannmoinet commented on Mar 26, 2015

    @yoannmoinet
    yoannmoinet
    on Mar 26, 2015
    Contributor

    Je ferme ceci, pour laisser la place à l'issue sur la documentation.

  10. yoannmoinet
    closed this as completedon Mar 26, 2015
  11. mikeal
    added a commit that references this issue on Jul 4, 2015

    Merge pull request #40 from paulirish/patch-1

    2c1fd21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Metadata

Metadata

Assignees

No one assigned

    Labels

    No labels
    No labels

    Type

    No type

    Projects

    No projects

      Milestone

      No milestone

      Relationships

      None yet

      Development

      No branches or pull requests

      Issue actions