Eclipse Community Forums: Compare

Home » Modeling » Compare » git logicalmerge(Merge models and text-files within one repository)

Fri, 17 December 2021 10:40

Eclipse User

Dear all,

I am wondering if it is possible to create a consistent merge if an EMF model and also some other text/code files are part of my repository.

My text/code files shall be merged with the standard git merge strategy for text files (e.g. recursive), and the model shall be merged with the logicalmerge mechanism provided by EMF.

What happens if I enter git logicalmerge within the command line if the repository contains models and text files?

Thanks and BR
Stefan

Re: git logicalmerge [message #1849086 is a reply to message #1848806]

Mon, 03 January 2022 04:09

Eclipse User

Hello Stefan,

The model merger provided by EMF Compare is only active for model files (according to the EMF and EMF Compare content types in the eclipse preferences). If a git merge operation contains both textual and model files, the textual files will be handled by the standard mergers while the model files will be handled by EMF Compare.

The git logicalmerge command should behave the same.

Regards,

Laurent Goubet
Obeo

Previous Topic:	loader constraint violation when launching an EMF compare comparison
Next Topic:	EMF Compare dialog in standalone RCP application e4

Goto Forum:

-=] Back to Top [=-

Current Time: Mon Jul 21 22:34:49 EDT 2025

.:: Contact :: Home ::.

Breadcrumbs

Sign up to our Newsletter