Auto resolve/merge
I want to implement my logic to "auto resolve" conflicts in case of merging some specific "*.xyz" files.
Is there an extension point available? Or is there any other way to do this? |
3 answers
RTC is based on Eclipse which provides the ability for clients to
provide both a merge editor and a headless merger. If you are only interested in the "Auto Resolve" capability, you will want to associate an IStorageMerger with your file type. The interface and it's corresponding extension point (org.eclipse.team.core.storageMergers) is provided by the org.eclipse.team.core plug-in. Michael anujbanga wrote: I want to implement my logic to "auto resolve" conflicts in |
|
Hi Michael,
Can this "auto resolve" capability be implemented by extending "org.eclipse.compare.streamMergers"? How is it different from storageMerger? Also, I am extending "org.eclipse.compare.contentMergeViewers" to create an UI/editor for manual merge. Can the auto resolve be implemented in the same class? |
|
The problem with the streamMerger extension point is that it lives in
the org.eclipse.compare plug-in which has UI dependencies. In Jazz, the auto-merging can occur at a Core level that cannot depend on the UI. Hence, we needed to use the storageMerger extension point since it has no UI dependencies. Finally, there is no API on a content merge viewer to perform an auto-merge so you will need to extend the storageMerger extension point if you want a custom auto-merge for your file type. Michael anujbanga wrote: Hi Michael, |
Your answer
Dashboards and work items are no longer publicly available, so some links may be invalid. We now provide similar information through other means. Learn more here.