1. A method of collaboratively authoring a data file, comprising: displaying the data file in an authoring window within a user interface; presenting to a user an interface enabling selection between displaying an editing conflict and hiding the editing conflict; in response to receiving a selection to display an editing conflict, displaying the authoring window and a conflict summary window within the user interface, the conflict summary window including a listing of unresolved editing conflicts and identifying a type of editing operation for each of the unresolved editing conflicts, wherein the type of editing operation identifies whether an edit was inserted, deleted or revised; in response to receiving a selection of one of the unresolved editing conflicts, displaying an accept control and a reject control; and allowing the user to select the accept control, resulting in accepting the editing conflict, or the reject control, resulting in rejecting the editing conflict.
1. A method of collaboratively authoring a data file, comprising: displaying the data file in an authoring window within a user interface; presenting to a user an interface enabling selection between displaying an editing conflict and hiding the editing conflict; in response to receiving a selection to display an editing conflict, displaying the authoring window and a conflict summary window within the user interface, the conflict summary window including a listing of unresolved editing conflicts and identifying a type of editing operation for each of the unresolved editing conflicts, wherein the type of editing operation identifies whether an edit was inserted, deleted or revised; in response to receiving a selection of one of the unresolved editing conflicts, displaying an accept control and a reject control; and allowing the user to select the accept control, resulting in accepting the editing conflict, or the reject control, resulting in rejecting the editing conflict. 7. The method of claim 1 , further comprising allowing the user to toggle between displaying the editing conflict and hiding the editing conflict.