Mailing-List: contact dev-help@cloudstack.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@cloudstack.apache.org
Received-SPF: pass (nike.apache.org: domain of Alex.Huang@citrix.com
 designates 66.165.176.63 as permitted sender)
From: Alex Huang <Alex.Huang@citrix.com>
To: "dev@cloudstack.apache.org" <dev@cloudstack.apache.org>
Date: Sat, 30 Mar 2013 08:20:34 -0700
Subject: RE: [DISCUSS] git rebase vs git merge in your feature branch?
Thread-Topic: [DISCUSS] git rebase vs git merge in your feature branch?
Thread-Index: Ac4s03ym+wjdP7moTCaid4rpGTnzwwAhdEFA
Message-ID: 
 <B1DF26ECC0458748AC97CECE2DA98D410143EB5252CA@SJCPMAILBOX01.citrite.net>
References: 
 <C66C814C1ABFA8449FF65CB44953A8B401414DAF339B@SJCPMAILBOX01.citrite.net>
In-Reply-To: 
 <C66C814C1ABFA8449FF65CB44953A8B401414DAF339B@SJCPMAILBOX01.citrite.net>
Accept-Language: en-US
Content-Language: en-US
acceptlanguage: en-US
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0

Dave and I have talked on IRC at one point about this.  We both thought fea=
ture branch merges should come in as a squashed commit because it's easier =
to see exactly what the changes that merge branch brought in were and easie=
r to revert.  Something to consider when talking about this.

--Alex

> -----Original Message-----
> From: Edison Su [mailto:Edison.su@citrix.com]
> Sent: Friday, March 29, 2013 4:36 PM
> To: dev@cloudstack.apache.org
> Subject: [DISCUSS] git rebase vs git merge in your feature branch?
>=20
> Hi all,
>      I am trying to review some feature branches, when I see merge reques=
ts
> coming from mailing list, one thing that makes code review almost unreali=
stic
> is that, developers tend to use "git merge" to master branch whenever
> rebase is needed. I don't know other people really do review feature bran=
ch
> or not, if so, how to review a feature branch, with several "merge branch
> "master""  on the feature branch. I really don't find a better way to do =
that.
>     If, all we use "git rebase" to master branch, then the code review wi=
ll be
> much easier, at least, what kind of commits you did on the feature branch
> can be easily identified. For example, I worked on storage_refactor branc=
h
> for a few months, with a lot of changes, before sending out merge request=
,
> there are only less than 10 commits on the branch, reviewer can use "git =
diff
> since..HEAD" to get all the changes.
>    Should we advocate "git rebase" in
> https://cwiki.apache.org/confluence/display/CLOUDSTACK/Git?