Mailing-List: contact dev-help@hbase.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@hbase.apache.org
Received-SPF: pass (athena.apache.org: domain of jesse.k.yates@gmail.com
 designates 209.85.220.175 as permitted sender)
MIME-Version: 1.0
In-Reply-To: 
 <CA+RK=_B8hvcXneMfWqZQfgbjJhEZZhiX9RGy_4a8xNO0a0ZGzA@mail.gmail.com>
References: 
 <CA+RK=_B8hvcXneMfWqZQfgbjJhEZZhiX9RGy_4a8xNO0a0ZGzA@mail.gmail.com>
Date: Fri, 23 May 2014 10:46:15 -0700
Message-ID: 
 <CAB5sDNLAo6Z-ep8Ca99LWPXGnao9tE3V5DdS-0n8JM4pa8e7Rw@mail.gmail.com>
Subject: Re: [DISCUSSION] Avoiding merge commits
From: Jesse Yates <jesse.k.yates@gmail.com>
To: dev@hbase.apache.org
Content-Type: multipart/alternative; boundary=047d7b2e548a5ea55504fa14ce51

--047d7b2e548a5ea55504fa14ce51
Content-Type: text/plain; charset=UTF-8

+1 that's how I do all my git development and what I advocate at salesforce
as well.
On May 23, 2014 10:39 AM, "Andrew Purtell" <apurtell@apache.org> wrote:

> I recommend we do not push merge commits upstream. I suppose it is easy
> enough to filter them out when looking at history but there is no need to
> be merging upstream branches into your local tracking branch when you can
> rebase instead. In this way we can avoid polluting the history in the
> master repository with unnecessary merge commit entries. (And maybe some
> devs will be merging upstream into tracking branches or merging commits
> from local feature branches several times per day, and these will all
> accumulate...)
>
> When updating your local tracking branch from upstream, use git fetch
> upstream && git rebase upstream/branch instead of 'git merge'.
>
> When developing features on a local branch it's possible to do a squash
> commit from the feature branch to the tracking branch using 'git rebase'
> instead of 'git merge', then a push of the single squashed commit from the
> tracking branch to the upstream branch.
>
> If these workflow choices are acceptable by consensus we can update the
> 'how to commit' document with an illustration of the workflow with example
> commands.
>
>
> --
> Best regards,
>
>    - Andy
>
> Problems worthy of attack prove their worth by hitting back. - Piet Hein
> (via Tom White)
>

--047d7b2e548a5ea55504fa14ce51--