concerted-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Atri Sharma <atri.j...@gmail.com>
Subject Re: Merging github PRs
Date Mon, 26 Oct 2015 15:53:35 GMT
Thanks!
On 26 Oct 2015 21:22, "Roman Shaposhnik" <roman@shaposhnik.org> wrote:

> What you do is simple (in fact I've got a personal script that
> automates this workflow):
>    wget
> https://patch-diff.githubusercontent.com/raw/apache/incubator-concerted/pull/2.patch
>    git am 2.patch
>    git commit --amend `git log --format=%B -n 1 HEAD | sed -e '1s#$#
> (closes \#2)#'`
>    git push
>
> This will preserve everything. On top of that it'll auto-close the PR
> on GH (that's what
> munging the commit message in the second line does).
>
> Thanks,
> Roman.
>
> On Mon, Oct 26, 2015 at 10:44 AM, Atri Sharma <atri.jiit@gmail.com> wrote:
> > https://github.com/apache/incubator-concerted/pull/2
> >
> > On Mon, Oct 26, 2015 at 9:10 PM, Roman Shaposhnik <roman@shaposhnik.org>
> > wrote:
> >
> >> Give me an example of the patch you're trying to merge and I think I
> >> can help you with the steps.
> >> At least the steps I use in my workflow.
> >>
> >> Thanks,
> >> Roman.
> >>
> >> On Mon, Oct 26, 2015 at 10:22 AM, Atri Sharma <atri.jiit@gmail.com>
> wrote:
> >> > Hi Mentors,
> >> >
> >> > I am trying to merge github PRs into github mirror. The steps I
> followed
> >> > were:
> >> >
> >> > https://mahout.apache.org/developers/github.html
> >> >
> >> > However, this still does not allow me to merge requests per se i.e. it
> >> does
> >> > not show that the original author's branch was merged. Rather, it
> >> squashes
> >> > the commits and creates a single commit from committer.
> >> >
> >> > Please advice if there is a way we can merge PRs in a way that retains
> >> > original author's name automatically.
> >> >
> >> > --
> >> > Regards,
> >> >
> >> > Atri
> >> > *l'apprenant*
> >>
> >
> >
> >
> > --
> > Regards,
> >
> > Atri
> > *l'apprenant*
>

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