polygene-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Niclas Hedhman <nic...@hedhman.org>
Subject Re: Pull Request #3
Date Mon, 13 Jun 2016 09:17:09 GMT
Great, I am adding a section in codebase.html about this...

On Mon, Jun 13, 2016 at 1:39 AM, Paul Merlin <paul@nosphere.org> wrote:

> One thing is, I rebased behind Github's back so the PR has not been
> automatically closed, and I don't have the privilege to do it:/
>
> Paul Merlin a écrit :
> > Niclas Hedhman a écrit :
> >> We have a small PR on GitHub from George (thanks!).
> >>
> >> Does anybody know how to get that into the Apache repository? AFAIK, it
> is
> >> not set up with two way synchronization (not yet).
> >>
> >> Cheers
> > I merged George's PR. Thanks you George if you're reading this!
> >
> > FTR, here are some hints about how to do it:
> > https://help.github.com/articles/checking-out-pull-requests-locally/
> >
> > Here's what I did:
> >
> > git remote add github https://github.com/apache/zest-java.git
> > git fetch github pull/3/head:merge-pr-3
> > git checkout merge-pr-3
> > git rebase develop
> > git checkout develop
> > git merge merge-pr-3
> > git branch -D merge-pr-3
> > git push origin develop
> >
> > Now that github supports rebasing/squashing/merging pull-requests with a
> > single click I'm looking forward to the two way synchronization.
> >
> >
>



-- 
Niclas Hedhman, Software Developer
http://zest.apache.org - New Energy for Java

Mime
  • Unnamed multipart/alternative (inline, None, 0 bytes)
View raw message