Try and create a weekly-ish trunk/non trunk pattern of commits on long active branches that need to be merged with trunk.