The disclosed embodiments relate to a system and method for performing conflict resolution when refreshing a materialized view. The system may comprise a logging mechanism that maintains a refresh log, the refresh log may contain a first range and a second range that at least partially overlap, the first range and the second range each having a timestamp associated therewith. The system may also include a refresh manager that resolves conflicts between the first range and the second range that at least partially overlap by selecting portions of the first range and the second range that have the more recent timestamp and applying the selected portions of the first range and the second range to the materialized view. In another embodiment, the system may comprise a logging mechanism that maintains a refresh log, the refresh log containing a range and a single-row entry, the range and the single row entry each having a timestamp associated therewith. The system may also include a refresh manager that resolves conflicts between the range and the single-row entry by ignoring the single-row entry if the single-row entry is part of the range and if the single-row entry has the more recent timestamp and by applying the single-row entry to the materialized view if the single-row entry is not part of the range or if the range has the more recent timestamp.