[gatein-dev] Merging

Could we try to avoid merging with bubbles unless there is clear benefit? As it is described here up until now we managed to keep nice history: https://community.jboss.org/wiki/GateInPortalGitContributionGuide However recently there were few merges with bubble without clear purpose IMO. We agreed in a past that when we merge larger topic branches it is ok to do no-ff. In such cases it is rather hard to squash properly and it can also lead to loosing history and not giving credit to everyone involved. Still if branch contains only few nicely separated commits and each of them is properly described with JIRA I see no clear benefit of no-ff merge. Just a reminder that it would be nice to have some consistency in how we handle git. I won't go on war to enforce it as in many cases it is a matter of taste and personal preferences - still please use common sense and try to follow agreed patterns. -- Bolesław Dawidowicz JBoss Portal Platform Architect | GateIn Portal Project Lead