Skip to main content

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.

Comments

  1. This comment has been removed by the author.

    ReplyDelete
  2. Step 5 should say repo1 on the first line --> git remote add upstream https://github.com/org/repo1.git

    ReplyDelete

Post a Comment

Popular posts from this blog

Could not load file or assembly 'Microsoft.Web.Infrastructure'

Could not load file or assembly 'Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35' or one of its dependencies. The system cannot find the file specified. What 'Micorosoft.Web.Infrastructure' does? This dll lets HTTP modules register at run time. Solution to above problem: Copy 'Micorosoft.Web.Infrastructure' dll in bin folder of your project and this problem should be resolved. If you have .Net framework installed on machine, this dll should be present on it. You can search for this dll and copy it in your active project folder.   Alternatively,  you can install this dll using nuget package manager PM> Install-Package Microsoft.Web.Infrastructure -Version 1.0.0 Happy coding!!

Create chatbot in 20 minutes using RASA

This blog will help you create a working chatbot with in 20 minutes. For creating chatbot we need following libraries to be installed- >> Python3 >> Pip3 >> Rasa Lets start installing all libraries & dependencies which are need for creating chatbot. Note: I have used MAC, therefore sharing commands related to it. You can install it on Windows, Linux or any other operating system using respective commands. 1. Install Python3 > brew install python3 > python --version #make sure you have python3 installed 2. Install Pip3 > curl -O https://bootstrap.pypa.io/get-pip.py > sudo python3 get-pip.py If you get issue related to Frameoworks while installing pip, follow below steps -  > cd /usr/local/lib > mkdir Frameworks > sudo chown -R $(whoami) $(brew --prefix)/* Once installed check pip3 version > pip3 --version After python3 and pip3 is succeffully installed, proceed to next steps. 3. Install Rasa > pip

Running dotnet on Linux

Server: Linux, version SUSE 12 To run dotnet code on Linux, the first and foremost task is to "Install Mono package on linux". Note: Mono is an open implementation of Microsoft's .Net framework, including compilers. It uses the same development libraries on Linux which are being used on Windows. Therefore, if you code and compiled some mono code on Linux,  it will work for Windows as well.       zypper is a package installation tool which is used in this scenario. If zypper is not available, check which package manager tool is installed on server. Furthermore, to verify if zypper is installed or not, type zypper on command line which will show all options if zypper is available on server else it will show 'command not found'. zypper ar -r http://download.opensuse.org/repositories/Mono/SLE_11_SP2/Mono.repo The above command will download from mentioned URL in a new repository. Here 'ar' stands for 'add repo'. After adding it to repos