Method and system for sharing file based data
First Claim
Patent Images
1. A method comprising:
- creating a local copy at a local computer of a shared file;
receiving user input at the local computer modifying the local copy;
updating the local copy with changes made to the shared file since the local copy was created;
detecting conflicts between the local copy and the changes made to the shared file;
marking the conflicts in the local copy;
updating the shared file to include changes made to the local copy without requiring the conflicts to be resolved, the local copy replacing the conflicts in the shared file;
storing the conflicting version of the shared file in a history.
1 Assignment
0 Petitions
Accused Products
Abstract
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.
224 Citations
25 Claims
-
1. A method comprising:
-
creating a local copy at a local computer of a shared file; receiving user input at the local computer modifying the local copy; updating the local copy with changes made to the shared file since the local copy was created; detecting conflicts between the local copy and the changes made to the shared file; marking the conflicts in the local copy; updating the shared file to include changes made to the local copy without requiring the conflicts to be resolved, the local copy replacing the conflicts in the shared file; storing the conflicting version of the shared file in a history. - View Dependent Claims (2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14)
-
-
15. A method for resolving conflicts between versions of a file, comprising,
receiving user input defining a boundary defining a conflict area; -
detecting conflicts between versions of a file based on changes made to elements within the conflict area; marking the conflicts in one of the versions of the file; saving the one version of the file as the current version, including the conflicts; and saving the other version of the file in a history. - View Dependent Claims (16)
-
-
17. A method for sharing and isolating changes made to shared files, comprising:
-
creating at least one shared file that is accessible to plural users; creating at least one second tier arranged in a hierarchical fashion under the shared file, the second tier including at least a first file and a second file, which are copies of the shared file, the first and second files being accessible to plural users; linking the first and second files to the shared file; creating a local copy of the first file on a client device; editing the local copy of the first file at the client device; committing the edited copy to the first file, without changing the second file; committing a changed version of the first file to the shared file; and subsequently updating the second file to reflect changes made to the shared file. - View Dependent Claims (18, 19, 20)
-
-
21. A method of updating design files while a project is in progress, comprising:
-
modifying a shared file to reflect changes made to a project standard using an administrator function; refreshing a local copy of the shared file to reflect the changes made to the project standard. - View Dependent Claims (22, 23, 24, 25)
-
Specification