An industrial integrated development environment (IDE) supports collaborative tools that allow multiple designers and programmers to remotely submit design input to the same automation system project in parallel while maintaining project consistency. The industrial IDE also permits localized development of system projects, and provides an infrastructure for intelligently brokering between conflicting edits submitted to common portions of the system project. Project edits submitted to the IDE system, both applied and unapplied, are stored as edit records, allowing edits to be selectively undone or applied either manually or as part of a rollback to a milestone version.