[sytse]

The idea is that you split features up in smaller parts so that you merge not more than a handful of days of work at a time.