tkaczenko/merge-from-one-git-to-another.md

Last active March 25, 2024 14:21

Star (0) You must be signed in to star a gist
Fork (0) You must be signed in to fork a gist

Select an option

Learn more about clone URLs
Clone this repository at <script src="https://gist.github.com/tkaczenko/4cadd31516c827bd589f495c94364ac3.js"></script>
Save tkaczenko/4cadd31516c827bd589f495c94364ac3 to your computer and use it in GitHub Desktop.

Download ZIP

How to merge changes from one repository to another one?

Raw

merge-from-one-git-to-another.md

How to merge changes from one Git repository to another one?

For example, we need to migrate the Github (old) repository to Bitbucket (new) repository and we need to keep both of them for a while.

To do it we need to make the next steps

Git clone Bitbucket (new) repository

 git clone [email protected]/example.git

Add origin2 to Github (old) for the repository cloned from Bitbucket (new)

git remote add origin2 [email protected]/example.git

Push develop-new Bitbucket (new) branch to Github (old)

git push origin2 develop-new:develop-new

Clone Github (old) repository

git clone [email protected]/example.git

Identify changes in Github (old), applied later than captured date

git log develop
git log develop-new

Cherry-pick appropriate change-sets from develop into develop-new in GitHub

git switch develop-new
git cherry-pick ...

Push appropriate changes in develop-saferent in GitHub

git push

Fully clone and rewrite Bitbucket (new) repository by GitHub (old) repo, sample

git clone --bare [email protected]/example.git
git push --mirror [email protected]/example.git

Remove the directory with the bare repository.

rm -rf example.git

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