[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [linuxtools-dev] Gerrit merge strategy
- From: akurtakov <akurtakov@xxxxxxxxx>
- Date: Tue, 17 Jul 2012 17:52:36 +0300
- Delivered-to: firstname.lastname@example.org
- Dkim-signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :content-type:content-transfer-encoding; bh=IDkAIZK4y8lIiXBbglvuZiW8EuGEhFBYHeczNEWe5eI=; b=D18XZ3S7egCUFuA6/r/CSWnuW7oRRCtx+3a725C86MKz1XatA49wMjtXYImklD/eIE lcK/0z/6h+6I4bY6OY8/4aJ2JxelZ/Z8ngOfUWIx1iZNC3RJbYIvDbxdwu1N9PuXXRV3 yNNlu9pa1gsw4+s/7TIMIw35UJkmZdCqDvXwlSqM0uF+EPuWQIUZlwq3umyQK3B6I2O6 kG3L2sz9ADJlmUCMGDVpgzu4U4OPMpbouv/AYpH+IsHycE4fHxgWbHjoUGVr3rD84R0z ojQxguL/01bzyYEnbAHqPTCo0tGSedyUmYEQ0tpopab5nVlt1HyR35QCoEWyfAuowDB4 zX8w==
I wouldn't mind it if the dependencies problem is fixed now.
On Tue, Jul 17, 2012 at 5:46 PM, Alexandre Montplaisir
> 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
> Now they are indeed using the "Cherry-pick" option.
> Alexandre Montplaisir
> DORSAL lab,
> Ãcole Polytechnique de MontrÃal
> linuxtools-dev mailing list