search

Doveps / mono

Code for Doveps projects
http://doveps.com
MIT License
0 stars 0 forks source link

Import active branches of component repositories #1

Closed greenmoss closed 7 years ago

greenmoss commented 7 years ago

new branch will be called "dev", consisting of imported branches from following repos:

bassist: postgres2.0 savant: django2.0

greenmoss commented 7 years ago

Commands:

git checkout -b dev
git merge -s recursive -Xsubtree=bassist old_bassist/postgres2.0
git merge -s recursive -Xsubtree=savant old_savant/django2.0

The old_* repo names come from the merge using this technique: https://saintgimp.org/2013/01/22/merging-two-git-repositories-into-one-repository-without-losing-file-history/

greenmoss commented 7 years ago

This was done; see branch dev.