cloudstack-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Chip Childers <chip.child...@sungard.com>
Subject Re: [DISCUSS] git rebase vs git merge in your feature branch?
Date Mon, 01 Apr 2013 17:11:30 GMT
On Mon, Apr 01, 2013 at 10:08:52AM -0700, Chiradeep Vittal wrote:
> -0 on squash
> Sometimes features need to modify core components. Squashing loses the
> history /reasoning behind that modification. I would leave the decision of
> selective squashing to the committer.

Agreed.  It totally depends on the specifics of the situation.
Sometimes a squash of everything will make sense.  Other times, a squash
of some commits to tidy things up will make sense.  And finally,
sometimes it doesn't matter at all, and everything can be squashed.

Mime
View raw message