A discussion which could interest more of you: https://github.com/infinispan/infinispan/pull/2613#issuecomment-45760469 There is no golden rule, but I believe it's highly desirable to give the sequence a logical flow which makes sense. In this specific situation, it also helped myself as I've been making slow progress fragmented over some months on it. For example, this single commit is a single sed script, whose source is included in the commit: https://github.com/Sanne/infinispan/commit/c4b22038761d38da21480d87a37abc... Guess what I need to do when rebasing? Also if you keep the flow "logical" and separate file rename/move from changes, git will help you massively on resolving conflicts on any change made concurrently on the same files. For example the WildFly 81 PR would have been much less painful, and I think would have been integrated way earlier as it wouldn't look as scary.. Finally, I want to win the commits competitions of course ;-) https://github.com/Sanne Cheers, Sanne _______________________________________________ infinispan-dev mailing list infinispan-dev(a)lists.jboss.org https://lists.jboss.org/mailman/listinfo/infinispan-dev

On Jun 11, 2014, at 17:45, Adrian Nistor <anistor(a)redhat.com&gt; wrote: > I think the journey is at least as important as the destination and > documenting each major step along the way by leaving a clear mark in > version history is a good thing. +1 for splitting commits whenever it > makes sense. +1, greatly helps with review and history. Cheers,