On Wednesday, 10 de November de 2010 19:52:43 Ademar Reis wrote: > One of the problems with the current qt git repository is that there > are way too many merges, most of them unnecessary. It's difficult to > follow the development due to all the pollution there. For example, > from the top 1000 commits on qt.git right now, 37.6% are merge > commits!
Hint: git log --no-merge
The number of merges is an unfortunate side-effect of not enforcing the use of
rebases (some developers only know "git pull") and the CI system insisting on
doing merge -no-ff.
> My suggestion would be: git cherry-pick if it's one commit; If not,
> then merge on a temporary branch, rebase with the mainline and just
> then merge (fast-forward). git merge (non fast-forward) should be
> saved for cases when it makes sense to think of the development
> happening as a fork (for example, to implement a complex feature or
> when integrating an old branch).
That's my thinking as well
--
Thiago Macieira - thiago.macieira (AT) nokia.com
Senior Product Manager - Nokia, Qt Development Frameworks
Sandakerveien 116, NO-0402 Oslo, Norway
signature.asc
Description: This is a digitally signed message part.
_______________________________________________ Opengov mailing list Opengov@qt-labs.org http://lists.qt-labs.org/listinfo/opengov
