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. Con: git log master..next will show the pre-squashed commits, until we reset next again. I'm tending towards squashing. Martin
_______________________________________________ fenics mailing list [email protected] http://fenicsproject.org/mailman/listinfo/fenics
