Article ID: 928716 - View products that this article applies to.
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:
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:
For more information, click the following article number to view the article in the Microsoft Knowledge Base:
(http://support.microsoft.com/kb/911594/ )How to resolve conflicting files when you publish a Web site to a server in FrontPage 2003