This probably can't be done but I thought I would ask.

So I've got a fork of libopencm3-examples, I would like to merge in the
various pull requests that are sitting in the queue on the real repo, what
git command could I use to do that? Sort of 'git merge
remote/master-pullxxx'


On Sat, Dec 7, 2013 at 7:18 PM, Karl Palsson <notifications@github.com>wrote:

> In examples/stm32/f1/stm32-h103/traceswo/traceswo.c:
>
> >  		;
> >
> > -	ITM_STIM[0] = c;
> > +	ITM_STIM8(0) = c;
>
> On 12/07/2013 11:05 PM, Chuck McManis wrote: In
> examples/stm32/f1/stm32-h103/traceswo/traceswo.c: > ; > > - ITM_STIM[0] =
> c; > + ITM_STIM8(0) = c; As far I know, only Esden has commit access to the
> examples repo so the point it somewhat moot. … <#>
> Yep, and that's entirely my "fault" :) I know it was a backwards
> incompatible change, and I have the changes locally, and I've got a series
> of blog posts I'm trying to finish that _use_ these changes, but I can't
> merge anything in the -examples repo anyway. Not ideal, Well aware of that,
> but otherwise I was just going to have to let stuff keep stacking up, and
> that's no good either! Cheers, Karl P
>
> —
> Reply to this email directly or view it on GitHub<https://github.com/libopencm3/libopencm3-examples/pull/30/files#r8183706>
> .
>