View source for EGit/Logical Model support

This work is developed by [http://tasktop.com Tasktop Technologies] and sponsored by [http://www.ericsson.com/ Ericsson] in the context of the [http://wiki.eclipse.org/ModelingPlatform Modeling Platform Industrial Working Group]

== Background ==

The goal is here to provide a decent implementation of "logical model" support in [http://eclipse.org/egit/ EGit]. The word "model" in "logical model" has nothing to do with the EMF concept of model. Sometimes in this document, we'll talk about logical resources interchangeably.

For more details about how logical model support has to be implemented relating to Team, you should read the document [http://www.eclipse.org/eclipse/platform-team/team3.2/logical-physical-mappings.html Team Support for Logical Model Integration].

For team providers like EGit, the following document is of high interest for implementation purposes: [http://help.eclipse.org/helios/topic/org.eclipse.platform.doc.isv/guide/team_model_repo.htm Repository Roadmap for Logical Model Integration]

For model providers like [http://www.eclipse.org/emf/compare/ EMF Compare], the following document is relevant: [http://help.eclipse.org/helios/topic/org.eclipse.platform.doc.isv/guide/team_model_model.htm Model Roadmap for Logical Model Integration]

EMF Compare will be used as one of the model providers to be tested as the team is currently working on support for Logical Models, see [http://wiki.eclipse.org/EMF_Compare/Logical_model_support Logical Model support for EMF compare]
== Deliverables ==

* Logical model support in Synchronize View
* Compare editor support for merge conflicts from the Synchonize View
* Design a model merge workflow across commits
* Merge, Update and Commit support inside Synchronize View
[[Image:Commit tree.png]]

* Show conflicting commits in Synchronize View

== Use cases ==

* Take logical models into account on
** Commit
** Replace
** Merge
** Pull

[[Image:Logical selection.jpg]]

* Logical model integration works with [http://wiki.eclipse.org/EMF_Compare/Logical_model_support EMF Compare]

== Development ==

Development occurs on master branch of EGit, reviewed on Gerrit

* [http://egit.eclipse.org/r/ Gerrit]
* [http://wiki.eclipse.org/EGit/Contributor_Guide EGit Contributor Guide]