I use the tools to merge other people PRS bc it is useful to maintain original author info.
I do use Git rebase before pushing my own PRs. So, no one uses the script to merge PRs? I will send update to the script to fix it. - Henry On Thursday, January 15, 2015, Fabian Hueske <fhue...@gmail.com> wrote: > Same here > On Jan 15, 2015 5:44 PM, "Alexander Alexandrov" < > alexander.s.alexand...@gmail.com <javascript:;>> wrote: > > > +1 for "git rebase" > > > > 2015-01-15 17:39 GMT+01:00 Aljoscha Krettek <aljos...@apache.org > <javascript:;>>: > > > > > No, I always do a manual "git rebase". Makes for a cleaner history. > And I > > > have more control over how things are merged and squashed. > > > On Jan 15, 2015 5:27 PM, "Henry Saputra" <henry.sapu...@gmail.com > <javascript:;>> > > wrote: > > > > > > > Oh, so you guys do not use the tools/merge_pull_request.sh script to > > > merge > > > > PRs? > > > > > > > > > > > > - Henry > > > > > > > > On Thu, Jan 15, 2015 at 6:45 AM, Robert Metzger <rmetz...@apache.org > <javascript:;>> > > > > wrote: > > > > > Hi, > > > > > I think I remember something like this. I don't really use the > tool. > > > > > Since I'm using the zsh I always know in which branch I am, so its > no > > > big > > > > > deal if the tool leaves me in a detached branch. > > > > > > > > > > Maybe we can think about removing the tool from the repo .. I don't > > > know > > > > > anybody using it. > > > > > > > > > > On Thu, Jan 15, 2015 at 2:33 AM, Henry Saputra < > > > henry.sapu...@gmail.com <javascript:;>> > > > > > wrote: > > > > > > > > > >> Hi All, > > > > >> > > > > >> In the merge tool python, the command "git rev-parse HEAD" > actually > > > > >> returns you to detached HEAD state after merging PR. > > > > >> > > > > >> Anyone else seen this behavior? > > > > >> > > > > >> > > > > >> - Henry > > > > >> > > > > > > > > > >
