On Thu, Jul 25, 2013 at 02:45:38PM -0400, Boleslaw Dawidowicz wrote:
I think mixed approach is best. We had "straight line / no
commits" and "squash everything into few nice commits" policy - works
great for bug fixes and PRs up to few commits. Then we realize that in
case of serious feature related topic branch it is just sad to squash
and lose a history - also don't give credit to everyone involved.
Still good to cleanup the branch before doing a PR... All in all I
personally think that such policies should be loose...
That's exactly what this
thread proposed - we were strict in losing no
commits/always doing merge commits, so relaxing it a little bit.