Resolve conflicting changes

When two or more people work on a document at the same time, they might make changes that conflict with one another. Conflicts can occur when one person works offline and then saves the document to the server. Conflicts can also occur when two people work on the same part of a document and save to the server before refreshing the document with updates made by other authors.

When edits conflict, you must resolve them before you can save the document to the server. All changes in the document are saved on your computer in the Microsoft Upload Center, even when the document contains conflicts. However, the changes aren't saved to the server until the conflicts are resolved. When conflicts exist, Word notifies you by displaying a message bar at the top of the document window and a notification in the status bar.

Important: You can save to any Windows Live OneDrive or to a server that has Microsoft Office SharePoint Server 2007 or Microsoft SharePoint Server 2010. To work with SharePoint in Office for Mac, you have to have Microsoft Office for Mac Home and Business 2011, Microsoft Office for Mac Academic 2011, or Microsoft Office for Mac Standard 2011.

  1. In the message bar, click Resolve Conflicts.

    Word displays the Your conflicting changes pane that lists the conflicts, and the Conflicts tab appears on the ribbon.

  2. In the Your conflicting changes pane, click a conflicting change to highlight the conflicting part of the document.

    Word uses pink highlighting to mark the conflicting changes that you made and green highlighting to mark changes made by other authors. Any other tracked changes that are in the document are temporarily hidden.

  3. Do one of the following:


Do this

Keep your change

On the Conflicts tab, under Conflicting Changes, click Accept My Change.

Remove your change

On the Conflicts tab, under Conflicting Changes, click Reject My Change.

  1. Conflict tab, Conflicts group

See also

Commands that might be disabled when more than one person is editing a document

Save and refresh documents on a server

Block authors

Share Facebook Facebook Twitter Twitter Email Email

Was this information helpful?

Great! Any other feedback?

How can we improve it?

Thank you for your feedback!