Skip to content

Instantly share code, notes, and snippets.

Show Gist options
  • Save pocheptsov/cf41f87fcd7ae52a5d986c67f5f65c1f to your computer and use it in GitHub Desktop.
Save pocheptsov/cf41f87fcd7ae52a5d986c67f5f65c1f to your computer and use it in GitHub Desktop.
Merging Git Repositories Into Another Repository Subfolder
git remote add -f js-tests [email protected]:cambridgebrainsciences/js-tests.git
git merge --no-commit -s ours js-tests/master
git read-tree --prefix=frontend/tests -u js-tests/master
git commit -m "Subtree merged in frontend/tests"
git remote remove js-tests
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment