Training
Module
Settle competing commits by using merge conflict resolution on GitHub - Training
Learn to settle overlapping commits across branches by using merge conflict resolution.
This browser is no longer supported.
Upgrade to Microsoft Edge to take advantage of the latest features, security updates, and technical support.
The Merge object provides access to other top-level objects. A Merge object must be created before loading the automation support required by COM to access the functions in Mergemod.dll.
Mergemod.dll provides access to the extended functionality at build time through a second version of the existing CLSID. This CLSID supports existing functionality available through the IMsmMerge interface, but the default interface on the object (and the associated dual interface) is the IMsmMerge2 interface instead of the IMsmMerge interface.
Training
Module
Settle competing commits by using merge conflict resolution on GitHub - Training
Learn to settle overlapping commits across branches by using merge conflict resolution.