This article describes how to resolve conflicting files when you publish a Web site to a server in Microsoft Expression Web.
When you use Expression Web to publish a Web site to a server, you may notice that the Status column displays Conflict for some of the files in the Remote Web Site view. This conflict status is indicated if the following conditions are true:
You change a file on the remote Web site.
You do not make the same changes to the file on the local Web site.
Note A conflict means that a file on the remote Web site changed after you last changed the same file on the local Web site.
First, decide which version of the file that you want to keep. Then, publish that version of the file to the remote Web site. If both versions of the file contain changes, open both files, and then manually merge the changes.
To prevent file conflicts, use one of the following methods:
Always change the local Web site first. Then, publish to the remote Web site.
Use the Synchronize option in the Remote Web Site view. The Synchronize option publishes files from the local Web site to the remote Web site or from the remote Web site to the local Web site. This option guarantees that both Web sites contain the most recent version of a file.
Note If both the local version and the remote version of a file contain changes, the Synchronize option will keep the most recent version and will overwrite the earlier version.
For more information, click the following article number to view the article in the Microsoft Knowledge Base:
911594 How to resolve conflicting files when you publish a Web site to a server in FrontPage 2003