Skip to content

Instantly share code, notes, and snippets.

@erseco
Created September 5, 2019 18:17
Show Gist options
  • Save erseco/813e3eb156300973b69259c34488f34d to your computer and use it in GitHub Desktop.
Save erseco/813e3eb156300973b69259c34488f34d to your computer and use it in GitHub Desktop.
Merge two repositories maintaining history
git clone git@bitbucket.org:exolever/exolever.git
git clone git@bitbucket.org:exolever/exo-services.git
cd exolever
mkdir service-exo-core
git mv !(service-exo-core) service-exo-core
git commit -a -S -m "Moving exolever into its own subdirectory (service-exo-core)"
cd ../exo-services
git remote add exolever ../service-exo-core
git fetch exolever
git checkout -b feature/merge-exolever
git merge -S --allow-unrelated-histories exolever/master
git push origin feature/merge-exolever
git remote rm exolever
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment