Mailing-List: contact dev-help@geode.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@geode.apache.org
MIME-Version: 1.0
In-Reply-To: <A835CAE9-93D0-4C0C-A43B-BD0C533DE891@pivotal.io>
References: <A835CAE9-93D0-4C0C-A43B-BD0C533DE891@pivotal.io>
From: Jinmei Liao <jiliao@pivotal.io>
Date: Thu, 5 Oct 2017 15:14:53 -0700
Message-ID: <CAHEKSU+JPc8yxHcgEuB010f=y6pbeFc13CVnDNLGXjtmjurULA@mail.gmail.com>
Subject: Re: Rebase and squash before merging PRs
To: geode <dev@geode.apache.org>
Content-Type: multipart/related; boundary="001a11448e54ccdc72055ad40d34"
archived-at: Thu, 05 Oct 2017 22:15:01 -0000

--001a11448e54ccdc72055ad40d34
Content-Type: multipart/alternative; boundary="001a11448e54ccdc70055ad40d33"

--001a11448e54ccdc70055ad40d33
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

On the PR UI page, you can do that by pull down the the menu when you are
ready to merge. Remember to use "Rebase and merge".


=E2=80=8B

Not sure if this is useful to everyone, but when I push a subsequent
commit to my feature branch, I always use "force push", so that it's
only one commit I need to rebase to develop.


On Thu, Oct 5, 2017 at 3:00 PM, Jared Stewart <jstewart@pivotal.io> wrote:

> I=E2=80=99ve been seeing a lot more merge commits on develop since we mov=
ed to
> Gitbox.  Just wanted to give everyone a friendly reminder to please rebas=
e
> before merging to keep our git history tidy and readable.
>
> Thanks,
> Jared


--=20
Cheers

Jinmei

--001a11448e54ccdc70055ad40d33
Content-Type: text/html; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

<div dir=3D"ltr">On the PR UI page, you can do that by pull down the the me=
nu when you are ready to merge. Remember to use &quot;Rebase and merge&quot=
;.<div><pre><font color=3D"#000000" face=3D"Menlo"><span style=3D"font-size=
:9pt"><img src=3D"cid:ii_j8f0q4z50_15eee997957a5a1e" width=3D"562" height=
=3D"214"><br>=E2=80=8B</span></font></pre><pre><font color=3D"#000000" face=
=3D"Menlo"><span style=3D"font-size:9pt">Not sure if this is useful to ever=
yone, but when I push a subsequent commit to my feature branch, I always us=
e &quot;force push&quot;, so that it&#39;s only one commit I need to rebase=
 to develop.</span></font></pre><div class=3D"gmail_extra"><br><div class=
=3D"gmail_quote">On Thu, Oct 5, 2017 at 3:00 PM, Jared Stewart <span dir=3D=
"ltr">&lt;<a href=3D"mailto:jstewart@pivotal.io" target=3D"_blank">jstewart=
@pivotal.io</a>&gt;</span> wrote:<br><blockquote class=3D"gmail_quote" styl=
e=3D"margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);paddin=
g-left:1ex">I=E2=80=99ve been seeing a lot more merge commits on develop si=
nce we moved to Gitbox.=C2=A0 Just wanted to give everyone a friendly remin=
der to please rebase before merging to keep our git history tidy and readab=
le.<br>
<br>
Thanks,<br>
Jared</blockquote></div><br><br clear=3D"all"><div><br></div>-- <br><div cl=
ass=3D"gmail-m_2505540881682039334gmail_signature"><div dir=3D"ltr">Cheers<=
div><br></div><div>Jinmei</div></div></div>
</div></div></div>

--001a11448e54ccdc70055ad40d33--

--001a11448e54ccdc72055ad40d34--