File tree conflict processor
First Claim
1. A method for processing conflicts in a first and second file tree comprising:
- presenting one or more conflicts to a user;
presenting more than one unresolved independent conflicts as a single conflict to said user;
obtaining input from said user; and
handling said one or more conflicts and said single conflict based on said input.
2 Assignments
0 Petitions
Accused Products
Abstract
The embodiments of the present invention provide a method for resolving conflicting changes encountered when reconciling parallel user changes to two synchronized trees of folders and files. According to one embodiment, these conflicts are presented to the user as an interface that requires an indication from the user to the winner of the conflict. According to another embodiment, since certain conflicts cannot be resolved independently, they have to be combined and presented to the user as a single conflict. According to yet another embodiment, after the user has indicated which operations are the winners of all or some of the conflicts, the winning operations are applied to the file tree with which they are in conflict.
24 Citations
30 Claims
-
1. A method for processing conflicts in a first and second file tree comprising:
-
presenting one or more conflicts to a user;
presenting more than one unresolved independent conflicts as a single conflict to said user;
obtaining input from said user; and
handling said one or more conflicts and said single conflict based on said input. - View Dependent Claims (2, 3, 4, 5, 6, 7, 8, 9, 10)
-
-
11. An article of manufacture comprising:
-
a computer usable medium having computer readable program code embodied therein for processing conflicts in a first and second file tree, said computer readable program code in said article of manufacture comprising;
computer readable program code configured to cause said computer to present one or more conflicts to a user;
computer readable program code configured to cause said computer to present more than one unresolved independent conflicts as a single conflict to said user;
computer readable program code configured to cause said computer to obtain input from said user; and
computer readable program code configured to cause said computer to handle said one or more conflicts and said single conflict based on said input. - View Dependent Claims (12, 13, 14, 15, 16, 17, 18, 19, 20)
-
-
21. A computer program product comprising:
-
a computer useable medium having computer readable program code embodied therein configured to process conflicts in a first and second file tree, said computer program product comprising;
computer readable code configured therein to cause a computer to present one or more conflicts to a user;
computer readable code configured therein to cause a computer to present more than one unresolved independent conflicts as a single conflict to said user;
computer readable code configured therein to cause a computer to obtain input from said user; and
computer readable code configured therein to cause a computer to handle said one or more conflicts and said single conflict based on said input. - View Dependent Claims (22, 23, 24, 25, 26, 27, 28, 29, 30)
-
Specification