发明申请
- 专利标题: Conflict Resolution
- 专利标题(中): 解决冲突
-
申请号: US12111174申请日: 2008-04-28
-
公开(公告)号: US20090271696A1公开(公告)日: 2009-10-29
- 发明人: Jonathan Beckett Bailor , Ethan Joseph Bernstein , Kelly Michael Krout , Matthew Eric Mizulo , Jonathan Ian Gordner
- 申请人: Jonathan Beckett Bailor , Ethan Joseph Bernstein , Kelly Michael Krout , Matthew Eric Mizulo , Jonathan Ian Gordner
- 申请人地址: US WA Redmond
- 专利权人: MICROSOFT CORPORATION
- 当前专利权人: MICROSOFT CORPORATION
- 当前专利权人地址: US WA Redmond
- 主分类号: G06F17/00
- IPC分类号: G06F17/00
摘要:
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.
公开/授权文献
- US08352870B2 Conflict resolution 公开/授权日:2013-01-08