>
> Alex
>
> On Tue, Jul 17, 2012 at 5:46 PM, Alexandre Montplaisir
> <
alexandre.montplaisir@xxxxxxxxxx> wrote:
> > Hi all,
> >
> > We've been using the new Gerrit for the past week, and
> we're loving it ;)
> >
> > However I've noticed the merge strategy in the Project
> Options is set to
> > "Merge If Necessary", which is the default value. This
> creates a lot of
> > empty merge commits if the commit we're merging wasn't
> based exactly on
> > the latest master.
> >
> > What would you guys think about using the "Cherry-pick"
> option instead?
> > It means that every patch gets rebased on the master before being
> > merged. This would guarantee that the git history remains
> linear, which
> > makes it much easier to bisect, and is prettier in general.
> >
> >
> > CDT had a similar discussion in the past, see
> >
https://bugs.eclipse.org/bugs/show_bug.cgi?id=375448
> > Now they are indeed using the "Cherry-pick" option.
> >
> >
> > Cheers,
> >
> > --
> > Alexandre Montplaisir
> > DORSAL lab,
> > École Polytechnique de Montréal
> >
> > _______________________________________________
> > linuxtools-dev mailing list
> >
linuxtools-dev@xxxxxxxxxxx
> >
https://dev.eclipse.org/mailman/listinfo/linuxtools-dev
> _______________________________________________
> linuxtools-dev mailing list
>
linuxtools-dev@xxxxxxxxxxx
>
https://dev.eclipse.org/mailman/listinfo/linuxtools-dev
>
_______________________________________________
linuxtools-dev mailing list
linuxtools-dev@xxxxxxxxxxx
https://dev.eclipse.org/mailman/listinfo/linuxtools-dev
