modeling in a team environment with emf compare and egit
TRANSCRIPT
![Page 1: Modeling in a Team Environment with EMF Compare and EGit](https://reader031.vdocuments.mx/reader031/viewer/2022030309/58f2ccb21a28aba3148b456f/html5/thumbnails/1.jpg)
M O D E L I N G I N A T E A M E N V I R O N M E N T W I T H
E M F C O M PA R E
E G I T A N D
Mikaël Barbero Obeo
Polarsys Day December 3rd, 2013
![Page 2: Modeling in a Team Environment with EMF Compare and EGit](https://reader031.vdocuments.mx/reader031/viewer/2022030309/58f2ccb21a28aba3148b456f/html5/thumbnails/2.jpg)
G I T
![Page 3: Modeling in a Team Environment with EMF Compare and EGit](https://reader031.vdocuments.mx/reader031/viewer/2022030309/58f2ccb21a28aba3148b456f/html5/thumbnails/3.jpg)
L I N U S T O R VA L D
C R E A T E D B Y
![Page 4: Modeling in a Team Environment with EMF Compare and EGit](https://reader031.vdocuments.mx/reader031/viewer/2022030309/58f2ccb21a28aba3148b456f/html5/thumbnails/4.jpg)
B I T K E E P E R
A S A R E P L A C E M E N T F O R
![Page 5: Modeling in a Team Environment with EMF Compare and EGit](https://reader031.vdocuments.mx/reader031/viewer/2022030309/58f2ccb21a28aba3148b456f/html5/thumbnails/5.jpg)
D I S T R I B U T E DG I T I S
![Page 6: Modeling in a Team Environment with EMF Compare and EGit](https://reader031.vdocuments.mx/reader031/viewer/2022030309/58f2ccb21a28aba3148b456f/html5/thumbnails/6.jpg)
E C L I P S E F O U N D AT I O N S I N C E 2 0 1 1
P R I M A R Y S C M O F T H E
![Page 7: Modeling in a Team Environment with EMF Compare and EGit](https://reader031.vdocuments.mx/reader031/viewer/2022030309/58f2ccb21a28aba3148b456f/html5/thumbnails/7.jpg)
H O S T I N G S E R V I C EP O P U L A R I Z E D B Y FA M O U S
![Page 8: Modeling in a Team Environment with EMF Compare and EGit](https://reader031.vdocuments.mx/reader031/viewer/2022030309/58f2ccb21a28aba3148b456f/html5/thumbnails/8.jpg)
E G I T
![Page 9: Modeling in a Team Environment with EMF Compare and EGit](https://reader031.vdocuments.mx/reader031/viewer/2022030309/58f2ccb21a28aba3148b456f/html5/thumbnails/9.jpg)
![Page 10: Modeling in a Team Environment with EMF Compare and EGit](https://reader031.vdocuments.mx/reader031/viewer/2022030309/58f2ccb21a28aba3148b456f/html5/thumbnails/10.jpg)
E M F C O M PA R E
![Page 11: Modeling in a Team Environment with EMF Compare and EGit](https://reader031.vdocuments.mx/reader031/viewer/2022030309/58f2ccb21a28aba3148b456f/html5/thumbnails/11.jpg)
C O M PA R E
M E R G E
![Page 12: Modeling in a Team Environment with EMF Compare and EGit](https://reader031.vdocuments.mx/reader031/viewer/2022030309/58f2ccb21a28aba3148b456f/html5/thumbnails/12.jpg)
![Page 13: Modeling in a Team Environment with EMF Compare and EGit](https://reader031.vdocuments.mx/reader031/viewer/2022030309/58f2ccb21a28aba3148b456f/html5/thumbnails/13.jpg)
![Page 14: Modeling in a Team Environment with EMF Compare and EGit](https://reader031.vdocuments.mx/reader031/viewer/2022030309/58f2ccb21a28aba3148b456f/html5/thumbnails/14.jpg)
![Page 15: Modeling in a Team Environment with EMF Compare and EGit](https://reader031.vdocuments.mx/reader031/viewer/2022030309/58f2ccb21a28aba3148b456f/html5/thumbnails/15.jpg)
C H A L L E N G E S
T E A M M O D E L I N G
![Page 16: Modeling in a Team Environment with EMF Compare and EGit](https://reader031.vdocuments.mx/reader031/viewer/2022030309/58f2ccb21a28aba3148b456f/html5/thumbnails/16.jpg)
![Page 17: Modeling in a Team Environment with EMF Compare and EGit](https://reader031.vdocuments.mx/reader031/viewer/2022030309/58f2ccb21a28aba3148b456f/html5/thumbnails/17.jpg)
![Page 18: Modeling in a Team Environment with EMF Compare and EGit](https://reader031.vdocuments.mx/reader031/viewer/2022030309/58f2ccb21a28aba3148b456f/html5/thumbnails/18.jpg)
![Page 19: Modeling in a Team Environment with EMF Compare and EGit](https://reader031.vdocuments.mx/reader031/viewer/2022030309/58f2ccb21a28aba3148b456f/html5/thumbnails/19.jpg)
A
G
D
B
C
F
E
![Page 20: Modeling in a Team Environment with EMF Compare and EGit](https://reader031.vdocuments.mx/reader031/viewer/2022030309/58f2ccb21a28aba3148b456f/html5/thumbnails/20.jpg)
A
G
D
B
C
F
E
![Page 21: Modeling in a Team Environment with EMF Compare and EGit](https://reader031.vdocuments.mx/reader031/viewer/2022030309/58f2ccb21a28aba3148b456f/html5/thumbnails/21.jpg)
A
G
D
B C
F
E
![Page 22: Modeling in a Team Environment with EMF Compare and EGit](https://reader031.vdocuments.mx/reader031/viewer/2022030309/58f2ccb21a28aba3148b456f/html5/thumbnails/22.jpg)
Left (local)
Right (remote)
AncestorA
G
D
B C
F
E
A
G
D
B C
F
E
A
G
D
B C
F
E
![Page 23: Modeling in a Team Environment with EMF Compare and EGit](https://reader031.vdocuments.mx/reader031/viewer/2022030309/58f2ccb21a28aba3148b456f/html5/thumbnails/23.jpg)
A
G
D
B C
F
E
A
G
D
B C
F
E
Left (local)
Right (remote)
AncestorA
G
D
B C
F
E
![Page 24: Modeling in a Team Environment with EMF Compare and EGit](https://reader031.vdocuments.mx/reader031/viewer/2022030309/58f2ccb21a28aba3148b456f/html5/thumbnails/24.jpg)
A
G
D
B C
F
E
A
G
D
B C
F
E
A
G
D
B C
F
E
Left (local)
Right (remote)
Ancestor
![Page 25: Modeling in a Team Environment with EMF Compare and EGit](https://reader031.vdocuments.mx/reader031/viewer/2022030309/58f2ccb21a28aba3148b456f/html5/thumbnails/25.jpg)
( A N G R Y ) B I R DK I L L I N G T W O P I G S W I T H T H E S A M E
![Page 26: Modeling in a Team Environment with EMF Compare and EGit](https://reader031.vdocuments.mx/reader031/viewer/2022030309/58f2ccb21a28aba3148b456f/html5/thumbnails/26.jpg)
L I G H T W E I G H TW E A R E
![Page 27: Modeling in a Team Environment with EMF Compare and EGit](https://reader031.vdocuments.mx/reader031/viewer/2022030309/58f2ccb21a28aba3148b456f/html5/thumbnails/27.jpg)
M O D E L W I T H 1 K R E S O U R C E S , 2 M E L E M E N T, 6 0 0 M B O F X M I 1 0 C H A N G E D R E S O U R C E S
L E S S T H A N 512MB
![Page 28: Modeling in a Team Environment with EMF Compare and EGit](https://reader031.vdocuments.mx/reader031/viewer/2022030309/58f2ccb21a28aba3148b456f/html5/thumbnails/28.jpg)
FA S TW E A R E
![Page 29: Modeling in a Team Environment with EMF Compare and EGit](https://reader031.vdocuments.mx/reader031/viewer/2022030309/58f2ccb21a28aba3148b456f/html5/thumbnails/29.jpg)
1 ’ 30
M O D E L W I T H 1 K R E S O U R C E S , 2 M E L E M E N T, 6 0 0 M B O F X M I 1 0 C H A N G E D R E S O U R C E S
![Page 30: Modeling in a Team Environment with EMF Compare and EGit](https://reader031.vdocuments.mx/reader031/viewer/2022030309/58f2ccb21a28aba3148b456f/html5/thumbnails/30.jpg)
Time
Number of changed resources
![Page 31: Modeling in a Team Environment with EMF Compare and EGit](https://reader031.vdocuments.mx/reader031/viewer/2022030309/58f2ccb21a28aba3148b456f/html5/thumbnails/31.jpg)
R E M E M B E RW H A T Y O U S H O U L D
E G I TE M F C O M PA R E
+
![Page 32: Modeling in a Team Environment with EMF Compare and EGit](https://reader031.vdocuments.mx/reader031/viewer/2022030309/58f2ccb21a28aba3148b456f/html5/thumbnails/32.jpg)
E N A B L E S
M O D E L I N G I N A T E A M E N V I R O N M E N T
![Page 33: Modeling in a Team Environment with EMF Compare and EGit](https://reader031.vdocuments.mx/reader031/viewer/2022030309/58f2ccb21a28aba3148b456f/html5/thumbnails/33.jpg)
H T T P : / / W W W. E C L I P S E . O R G / E G I T
H T T P : / / W W W. E C L I P S E . O R G / E M F / C O M PA R E