On Thu, Feb 06, 2014 at 10:51:31AM +0000, Garth N. Wells wrote: > On 2014-02-06 10:45, Martin Sandve Alnæs wrote: > >So I have this branch martinal/topic-foo which initially contained > >a bunch of commits. > > > >Before merging to next I squashed them so martinal/topic-foo only > >contained one commit on top of some previous commit from master. > > > >After merging martinal/topic-foo into next, I found a couple of > >minor issues that I fixed in martinal/topic-foo and merged again > >into next. > > > >Should I squash martinal/topic-foo again before merging into master? > >Pro: clean history in master, this lasts forever. > > I'm not really bothered about having super clean history.
Same here. I don't see the reason for squashing but squash if you feel like it. -- Anders > >Con: git log master..next will show the pre-squashed commits, until we > >reset next again. > > > > We can reset next whenever we want. I'm happy for it to be reset > during the development cycle if it makes things simpler/cleaner. We > tend to have few branches that are in next but not yet in master, so > adding things back to next is pretty easy. > > >I'm tending towards squashing. > > > > I'm happy with whatever is easiest for you. > > Garth > > >Martin > >_______________________________________________ > >fenics mailing list > >[email protected] > >http://fenicsproject.org/mailman/listinfo/fenics > _______________________________________________ > fenics mailing list > [email protected] > http://fenicsproject.org/mailman/listinfo/fenics _______________________________________________ fenics mailing list [email protected] http://fenicsproject.org/mailman/listinfo/fenics
