JIYIK CN >

When working on a project with multiple team members having separate repositories for each team, at some point in time we come across a situation where we want to combine these separate repositories into one master repository to deploy all the work using a single repository.

Trying to merge various repositories into one, or even preserve their precious commit history, may seem difficult, but it really isn't. In this article, we'll explain in detail, step by step, how to merge separate repositories into one master repository.

Steps to merge repositories in Git

Let's assume we have three repositories: repo Aand repo B, and then we have a repo Z, and we want to merge Aand B. Let's assume we have repo Zanother thing currently in the directory, and we want to merge these two repositories Aand Binto one Z.

Let's assume one more thing; repo Zit's the master branch of the repository.

1. Add remote URL

In this step, we will run git remote addthe command with the property f; this will add a remote for repo A, which we will name repo A.

git remote add -f remote-A .

With options -f, the command is processed immediately after setting the remote information git fetch <name>.

We will follow the same procedure as above for repo B.

git remote add -f remote-B <repo-B-URL>

2. Merge files and folders

Now, we will merge the files from repo A into the current branch (repo Z) using the following command.

git merge remote-A/master –allow-unrelated-histories

Here we will add --allow-unrelated-histories so that Git will allow merging unrelated histories.

The same process will be repeated on repo B using the following commands.

git merge remote-B/master --allow-unrelated-histories

If there are some conflicts after running the above commands, we will resolve them and then commit the merge successfully.

3. View commit history

We will run the following command git log to view the merged commit history, which will be our last step to view all merge histories of each repository.

git log