Mailing-List: contact dev-help@zookeeper.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@zookeeper.apache.org
MIME-Version: 1.0
From: Andor Molnar <andor@cloudera.com>
Date: Fri, 1 Dec 2017 07:25:14 +0100
Message-ID: <CAFBpvfsS3j5JDhj=z=bfJPrDW4d2pCWOrgYsf27b5ES7gSuV2g@mail.gmail.com>
Subject: Squash/fixup commits
To: dev@zookeeper.apache.org
Content-Type: multipart/alternative; boundary="94eb2c095f767b70d2055f416e87"
archived-at: Fri, 01 Dec 2017 06:25:27 -0000

--94eb2c095f767b70d2055f416e87
Content-Type: text/plain; charset="UTF-8"

Hi,

@afine raised this on my latest PR:
"going forward it would be great if you didn't squash your commits when
updating your pr in response to comments (I'm guilty of doing this too), i
think the pr merge script handles that plus it is more difficult to see
exactly what you changed in response to the comments."

I was under the impression that keeping one single commit in PRs makes
commiters' life a lot easier when cherry-picking. Also single commit merges
keep the git log cleaner on the master branch which is also a plus.

I won't do fixups going forward to make the reviews easier, just curious
how does it work behind the scenes?

Cheers,
Andor

--94eb2c095f767b70d2055f416e87--