It's all about the answers!

Ask a question

Auto resolve/merge


Anuj Banga (61) | asked Feb 20 '09, 5:20 a.m.
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



permanent link
Michael Valenta (3.6k3) | answered Feb 20 '09, 11:28 a.m.
FORUM MODERATOR / JAZZ DEVELOPER
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
case of merging some specific "*.xyz" files.
Is there an extension point available? Or is there any other way to do
this?

permanent link
Anuj Banga (61) | answered Feb 23 '09, 1:35 a.m.
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?

permanent link
Michael Valenta (3.6k3) | answered Feb 23 '09, 11:08 a.m.
FORUM MODERATOR / JAZZ DEVELOPER
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,

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?

Your answer


Register or to post your answer.