Just for the fun of it try the following (it took me less than 5 minutes):
- Create a new EAP with a view containing a single class "Class1"
- On the root issue Package Control/Configure and specify a path to a (temp) git repository
- Issue Package Control/Save...
- Commit the created XMI to git
- Clone the git repos
- Open a 2nd EA instance
- From the root issue Import Model from XMI (the clone) and place it on top
- remove the unused root
- Issue Package Control/Configure once again and adjust the path to point to the clone git repos.
(This is usually done via local paths and different users/machines but necessary for the local demo.)
- Change the name of the class to "Class One"
- Save the changes via Package Control/Save.. from the root
- Commit the changed xmi to git
- Go to the first EAP instance
- Change the class name to "Class Two"
- Save and commit
- Now pull the changes from repos1 to the clone
-> You will see three manual conflicts in the (very small) XMI.
Imagine what happens with complex (conflicting) alterations on both sides. If that does not heal you I don't have a medicine.
q.
P.S.: Here's the link where Simon explains the lack of git support:
http://www.sparxsystems.com/cgi-bin/yabb/YaBB.cgi?num=1337730997/1#1I was pretty sure there were more threads (also where Geert replied), but search revealed mainly this one :-/