Re: [boost] [githelp] Merging two repositories

Subject: Re: [boost] [githelp] Merging two repositories
From: Philippe Vaucher (philippe.vaucher_at_[hidden])
Date: 2013-12-10 03:52:20

> I have two separate local repositories cloned from the same other
> repository and I have made different changes to both. How do I merge those
> changes together using git ? Or do I have to do it manually ?
>

The simplest way is to have one reference the other, and then import your
changes that way.
Something along these lines:

cd repo1
git remote add otherrepo ../repo2
git fetch --all
git pull otherrepo master

Ask if you need more informations.
Philippe