Skip to main content


Eclipse Community Forums
Forum Search:

Search      Help    Register    Login    Home
Home » Modeling » EMF Diff/Merge » Repository containing model and code files(Using EMF git logicalmerge with repo containing code + model)
Repository containing model and code files [message #1848807] Fri, 17 December 2021 15:48
Stefan Rombach is currently offline Stefan RombachFriend
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
Previous Topic:Support for git crypt
Next Topic:EMF Compare crashing
Goto Forum:
  


Current Time: Thu Apr 18 02:04:00 GMT 2024

Powered by FUDForum. Page generated in 0.02184 seconds
.:: Contact :: Home ::.

Powered by: FUDforum 3.0.2.
Copyright ©2001-2010 FUDforum Bulletin Board Software

Back to the top