Conflict resolution
    3.
    发明授权
    Conflict resolution 有权
    解决冲突

    公开(公告)号:US08352870B2

    公开(公告)日:2013-01-08

    申请号:US12111174

    申请日:2008-04-28

    IPC分类号: G06F3/00

    CPC分类号: G06Q10/10 G06F17/30873

    摘要: Embodiments of a collaborative authoring environment enable a user to resolve editing conflicts arising when synchronizing a user copy of a data file with a master copy of the data file. Content updates may be synchronized separately from metadata updates. Metadata updates may be synchronized automatically, whereas content updates may be synchronized only when any identified editing conflicts are resolved. When an editing conflict is identified, the user interface of the authoring application may be configured to toggle between displaying and hiding the identified editing conflicts.

    摘要翻译: 协作创作环境的实施例使得用户能够解决在将数据文件的用户副本与数据文件的主副本同步时产生的编辑冲突。 内容更新可以与元数据更新分开同步。 元数据更新可以自动同步,而只有当任何已识别的编辑冲突被解决时,内容更新才可以同步。 当识别出编辑冲突时,创作应用的用户界面可以被配置为在显示和隐藏所识别的编辑冲突之间切换。

    Conflict Resolution
    4.
    发明申请
    Conflict Resolution 有权
    解决冲突

    公开(公告)号:US20090271696A1

    公开(公告)日:2009-10-29

    申请号:US12111174

    申请日:2008-04-28

    IPC分类号: G06F17/00

    CPC分类号: G06Q10/10 G06F17/30873

    摘要: Embodiments of a collaborative authoring environment enable a user to resolve editing conflicts arising when synchronizing a user copy of a data file with a master copy of the data file. Content updates may be synchronized separately from metadata updates. Metadata updates may be synchronized automatically, whereas content updates may be synchronized only when any identified editing conflicts are resolved. When an editing conflict is identified, the user interface of the authoring application may be configured to toggle between displaying and hiding the identified editing conflicts.

    摘要翻译: 协作创作环境的实施例使得用户能够解决在将数据文件的用户副本与数据文件的主副本同步时产生的编辑冲突。 内容更新可以与元数据更新分开同步。 元数据更新可以自动同步,而只有当任何已识别的编辑冲突被解决时,内容更新才可以同步。 当识别出编辑冲突时,创作应用的用户界面可以被配置为在显示和隐藏所识别的编辑冲突之间切换。

    Document merge
    6.
    发明授权
    Document merge 有权
    文件合并

    公开(公告)号:US08028229B2

    公开(公告)日:2011-09-27

    申请号:US11951973

    申请日:2007-12-06

    IPC分类号: G06F17/00

    CPC分类号: G06F17/2288

    摘要: Methods and systems of merging a first document with at least a second document to generate a third document. Each of the first and second documents includes at least one data unit. Each data unit is associated with a unit identifier and an edit identifier. The unit identifiers of each of the documents are compared to the unit identifiers of the other document to determine whether each unit identifier is a matching or non-matching unit identifier. Edit identifiers of the data units associated with the matching unit identifiers are compared to each other. Data units associated with the non-matching unit identifiers are inserted directly into the third document. Data units associated with the matching unit identifiers and the matching edit identifiers are inserted directly into the third document. Data units associated with the matching unit identifiers and the non-matching edit identifiers are merged into the third document.

    摘要翻译: 将第一文档与至少第二文档合并以生成第三文档的方法和系统。 第一和第二文档中的每一个包括至少一个数据单元。 每个数据单元与单元标识符和编辑标识符相关联。 将每个文档的单元标识符与另一文档的单元标识符进行比较,以确定每个单元标识符是匹配单元标识符还是不匹配单元标识符。 将与匹配单元标识符相关联的数据单元的编辑标识符彼此进行比较。 与非匹配单元标识符相关联的数据单元被直接插入到第三文档中。 与匹配单元标识符相关联的数据单元和匹配的编辑标识符被直接插入到第三文档中。 与匹配单元标识符和不匹配的编辑标识符相关联的数据单元被合并到第三文档中。

    Document Merge
    9.
    发明申请
    Document Merge 有权
    文件合并

    公开(公告)号:US20090150394A1

    公开(公告)日:2009-06-11

    申请号:US11951973

    申请日:2007-12-06

    IPC分类号: G06F17/30 G06F17/28

    CPC分类号: G06F17/2288

    摘要: Methods and systems of merging a first document with at least a second document to generate a third document. Each of the first and second documents includes at least one data unit. Each data unit is associated with a unit identifier and an edit identifier. The unit identifiers of each of the documents are compared to the unit identifiers of the other document to determine whether each unit identifier is a matching or non-matching unit identifier. Edit identifiers of the data units associated with the matching unit identifiers are compared to each other. Data units associated with the non-matching unit identifiers are inserted directly into the third document. Data units associated with the matching unit identifiers and the matching edit identifiers are inserted directly into the third document. Data units associated with the matching unit identifiers and the non-matching edit identifiers are merged into the third document.

    摘要翻译: 将第一文档与至少第二文档合并以生成第三文档的方法和系统。 第一和第二文档中的每一个包括至少一个数据单元。 每个数据单元与单元标识符和编辑标识符相关联。 将每个文档的单元标识符与另一文档的单元标识符进行比较,以确定每个单元标识符是匹配单元标识符还是不匹配单元标识符。 将与匹配单元标识符相关联的数据单元的编辑标识符彼此进行比较。 与非匹配单元标识符相关联的数据单元被直接插入到第三文档中。 与匹配单元标识符相关联的数据单元和匹配的编辑标识符被直接插入到第三文档中。 与匹配单元标识符和不匹配的编辑标识符相关联的数据单元被合并到第三文档中。