Subject: Re: [boost] [githelp] Merging two repositories
From: Oliver Kowalke (oliver.kowalke_at_[hidden])
Date: 2013-12-10 03:51:56


2013/12/10 Edward Diener <eldiener_at_[hidden]>

> 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 ?
>

maybe git cherry-pick might help