Patent ID: 7165248

Claim:
A computer-implemented 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, wherein said more than one unresolved independent conflicts are file tree conflicts determined from a comparison of the first and second file trees; obtaining input from said user; and handling said one or more conflicts and said single conflict based on said input, wherein one or more winning conflicts are applied to a file tree with which they were in conflict, and wherein if said winning conflicts are server operations, said server operations are translated back up a conflict list across previous server operations, and then down a conflict list across client operations, wherein the translation is one of a rename or a reparent of an object of said winning operation and said winning operation is changed to refer to said object using its new lineage, and if said winning conflicts are client operations, said client operations are translated back up a conflict list across previous client operations, and then down the conflict list across server operations, wherein the translation is one of a rename or a reparent of an object of said winning operation and said winning operation is changed to refer to said object using its new lineage.