Method and system for sharing file based data

摘要

A method for resolving conflicts between versions of a file is provided. User input defining a boundary defining a conflict area are received. Conflicts between versions of a file are detected based on changes made to elements within the conflict area. The conflicts are marked in one of the versions of the file. The one version of the file is saved as the current version, including the conflicts. The other version of the file is saved in a history.