Eclipse Community Forums: EMF Diff/Merge » Repository containing model and code files

Home » Modeling » EMF Diff/Merge » Repository containing model and code files(Using EMF git logicalmerge with repo containing code + model)

Show: Today's Messages :: Show Polls :: Message Navigator

Repository containing model and code files [message #1848807]

Fri, 17 December 2021 15:48

Stefan Rombach

Messages: 2
Registered: December 2021

Junior Member

Dear all,

is it possible to have code files and models within a repository and handle them it git with help of git logicalmerge?

I want that the code files are merged with the standard git merge strategy (text-based e.g. recursive strategy) and that the models are logical merged with emf.

What happens with the command "git logicalmerge" if not only models are part of the git repository?

Thanks, BR
Stefan

Report message to a moderator

Previous Topic:	Support for git crypt
Next Topic:	EMF Compare crashing

Goto Forum:

-=] Back to Top [=-

[ Syndicate this forum (XML) ] [

]

Current Time: Wed Apr 24 23:03:09 GMT 2024

.:: Contact :: Home ::.

Breadcrumbs

Sign up to our Newsletter