Presented at the Polarsys Day, December 3rd, 2013

1. MODELING IN A TEAM ENVIRONMENT WITH
EGIT AND
E M F C O M PA R E
Polarsys Day
December 3rd, 2013
Mikaël Barbero
Obeo

2. GIT

3. CREATED BY
LINUS
T O R VA L D

4. AS A REPLACEMENT FOR
BITKEEPER

5. GIT IS
DISTRIBUTED

6. PRIMARY SCM OF THE
ECLIPSE
F O U N D AT I O N
SINCE 2011

7. P O P U L A R I Z E D B Y FA M O U S
HOSTING SERVICE

8. EGIT

10. E M F C O M PA R E

11. C O M PA R E
MERGE

15. TEAM MODELING
CHALLENGES

19. A
C
D
B
G
E
F

20. A
C
D
B
G
E
F

21. A
B
C
D
G
E
F

22. Left (local)
A
Ancestor
A
B
C
D
E
G
B
C
F
D
G
E
F
Right (remote)
A
B
C
D
G
E
F

23. Left (local)
A
Ancestor
A
B
C
D
E
G
B
C
F
D
G
E
F
Right (remote)
A
B
C
D
G
E
F

24. Left (local)
A
Ancestor
A
B
C
D
E
G
B
C
F
D
G
E
F
Right (remote)
A
B
C
D
G
E
F

25. KILLING TWO PIGS WITH THE SAME
(ANGRY) BIRD

26. WE ARE
LIGHTWEIGHT

27. LESS THAN
512MB
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
10 CHANGED RESOURCES

28. WE ARE
FA S T

29. 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
10 CHANGED RESOURCES

30. Time
Number of
changed resources

31. WHAT YOU SHOULD
REMEMBER
+
E M F C O M PA R E
EGIT

32. ENABLES
MODELING IN A
TEAM ENVIRONMENT

33. 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