That works if the changes have been merged into the remote repo but it
doesn't help with pending merges. Basically I'd like to retarget a pull
from that repo to my repo and then merge it.


On Sat, Dec 7, 2013 at 10:27 PM, onnokort <notifications@github.com> wrote:

> In examples/stm32/f1/stm32-h103/traceswo/traceswo.c:
>
> >  		;
> >
> > -	ITM_STIM[0] = c;
> > +	ITM_STIM8(0) = c;
>
> This should work:
> git remote add https://.../remote-github-repo
> git remote update
> git merge /
> I am not aware that there is a git core command that allows direct merging
> from remote repositories, I think you have to create a local ref. first,
> but I could be wrong.
>
> —
> Reply to this email directly or view it on GitHub<https://github.com/libopencm3/libopencm3-examples/pull/30/files#r8183983>
> .
>