Git merge from one repo to another repo

This blog is for those who are looking for merging code from one repo to another repo.

Why I will merge code from one repo to another?
I forked from one git repo(may be some public git repo) and did some cutomization on existing code. Occasionaly, features are being introduced in main git branch and I would like to get all those features in my own git repo. In this scenario, I would like to merge latest changes in my git repo.

Here are few simple steps which will merge code from one git repo to another-

1. Clone the repo1(source git repo)
> git clone https://github.com/org/repo1.git  
> git pull

2. Clone the repo2(destination git repo)
> git clone https://github.com/org/repo2.git
> git pull

3. Goto repo2 (destination git folder) and checkout your prefered branch
> cd repo2
> git checkout master> 

4. Use below command to see the remote branch associated with your destination git repo
> git remote -v 
origin https://github.com/org/repo2.git (fetch)
origin https://github.com/org/repo2.git (push)

5. Add source branch as upstream branch
> git remote add upstream https://github.com/org/repo2.git
> git remote -v  - to verify that new upstream repo is added
origin https://github.com/org/repo2.git (fetch)
origin https://github.com/org/repo2.git (push)
upstream https://github.com/org/repo2.git (fetch)
upstream https://github.com/org/repo2.git (push)

6. You can use git command to pull and push the latest changes from one repo to another

7. Remove upstream once your latest changes are merged
> git branch --unset-upstream

Happy coding! Please share in case you experience any issue.