Build features with agents that stay out of each other's way.
Recent revisions are kept. Restoring one creates a new revision.
