[GO1] Combining two Git repositories

Transcript

1. GIT COMBINING TWO GIT REPOSITORIES <?php # from a PHP dev ?> Hoang Thien An
2. Mirroring a repository Merging two Git repositories TABLE OF CONTENTS Combining two Git repositories
3. 1 Mirroring a repository https://help.github.com/articles/duplicating-a-repository/ You must create the new repository on GitHub. In these examples, go1hub/util git clone --bare git@github.com:go1com/util.git cd util.git git push --mirror git@github.com:go1hub/util.git cd .. rm -rf util.git
4. 2 Merging two Git repositories cd util_core git remote add util git@github.com:go1hub/util.git git fetch util git merge --allow-unrelated-histories util/master # or whichever branch you want to merge git remote remove util If you want to merge go1hub/util into go1hub/util_core The --allow-unrelated-histories parameter only exists since git >= 2.9
5. 3 Combining two Git repositories git clone git@github.com:go1hub/util.git git clone git@github.com:go1hub/util_core.git cd util_core git remote rm origin git remote add origin git@github.com:go1hub/util.git git checkout master git branch -m master-holder git fetch git checkout master git pull origin master git rm -rf * git commit -m "Delete all the things." git merge master-holder --allow-unrelated-histories git push origin master Preserve all commits of both repositories, but replace everything from go1hub/util with the contents of go1hub/util_core https://gist.github.com/msrose/2feacb303035d11d2d05
6. Unlock positive potential through a love for learning “ ”
7. Thank you for your time, © GO1VN www.go1.com