Merge pull request #2117 from nschonni/merge-conflict

chore: Fix merge conflict

Author: tfosmark

docs/vs-2015/extensibility/internals/rdt-readlock-usage.md

@@ -34,11 +34,7 @@ manager: "ghogen"
  When a user opens a document in the UI, an <xref:Microsoft.VisualStudio.Shell.Interop.IVsHierarchy> owner for the document must be established and an <xref:Microsoft.VisualStudio.Shell.Interop._VSRDTFLAGS> flag must be set. If no <xref:Microsoft.VisualStudio.Shell.Interop.IVsHierarchy> owner can be established, then the document will not be saved when the user clicks **Save All** or closes the IDE. This means if a document is open invisibly where it is modified in memory, and the user is prompted to save the document on shutdown or saved if **Save All** is chosen, then an `RDT_ReadLock` cannot be used. Instead, you must use an `RDT_EditLock` and register a <xref:Microsoft.VisualStudio.Shell.Interop.IVsDocumentLockHolder> when an <xref:Microsoft.VisualStudio.Shell.Interop.__VSREGDOCLOCKHOLDER> flag.  
 
 ## RDT_EditLock and Document Modification  
-<<<<<<< HEAD
- The previous flag mentioned indicates that the invisible opening of the document will yield its `RDT_EditLock` when the document is opened by the user into a visible **DocumentWindow**. When this occurs, the user is presented with a **Save** prompt when the visible **DocumentWindow** is closed. `Microsoft.VisualStudio.Package.Automation.OAProject.CodeModel` implementations that use the <xref:Microsoft.VisualStudio.Shell.Interop.IVsInvisibleEditorManager> service initially work when only an `RDT_ReadLock` is taken (i.e., when the document is opened invisibly to parse information). Later, if the document must be modified, then the lock is upgraded to a weak **RDT_EditLock**. If the user then opens the document in a visible **DocumentWindow**, the `CodeModel`'s weak `RDT_EditLock` is released.  
-=======
  The previous flag mentioned indicates that the invisible opening of the document will yield its `RDT_EditLock` when the document is opened by the user into a visible **DocumentWindow**. When this occurs, the user is presented with a **Save** prompt when the visible **DocumentWindow** is closed. Microsoft.VisualStudio.Package.Automation.OAProject.CodeModel implementations that use the <xref:Microsoft.VisualStudio.Shell.Interop.IVsInvisibleEditorManager> service initially work when only an `RDT_ReadLock` is taken (i.e., when the document is opened invisibly to parse information). Later, if the document must be modified, then the lock is upgraded to a weak **RDT_EditLock**. If the user then opens the document in a visible **DocumentWindow**, the `CodeModel`'s weak `RDT_EditLock` is released.  
->>>>>>> 9c8493a8dd... Try a new moniker range to support combining versions
 
  If the user then closes the **DocumentWindow** and chooses **No** when prompted to save the open document, then the `CodeModel` implementation disposes of all information in the document and reopens the document from disk invisibly the next time more information is required for the document. The subtlety of this behavior is an instance where the user opens the **DocumentWindow** of the invisible open document, modifies it, closes it, and then chooses **No** when prompted to save the document. In this case, if the document has an `RDT_ReadLock`, then the document will not actually be closed and the modified document will stay open invisibly in memory, even though the user chose not to save the document.