Merging Mapped Files

If you attempt to synchronize files and Flare detects a conflict (i.e., a mapped file has been modified both locally and in its mapped location), a dialog opens so that you can take the appropriate action.

In the Synchronize Files dialog, you can tell if a conflict exists because a warning icon will display next to the files in question.