摘要 |
Systems and methods are provided for resolving conflicts. In one implementation, a method relating to modifying a view in a user interface is provided. The method includes receiving, while a current view is displayed in a user interface, a first user input requesting that a history view associated with the current view be displayed. The history view is displayed in response to the first user input, the history view includes at least a first visual representation of an earlier version of the current view, and the earlier version includes a first element. There is received, while the history view is displayed, a second user input requesting that the current view be modified according to the earlier version, at least with regard to the first element. The method further includes determining, in response to the second user input, whether the current view includes a current version of the first element. |