Successfully reported this slideshow.
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
GIT
CREATED BY

LINUS
T O R VA L D
AS A REPLACEMENT FOR

BITKEEPER
GIT IS

DISTRIBUTED
PRIMARY SCM OF THE

ECLIPSE
F O U N D AT I O N
SINCE 2011
P O P U L A R I Z E D B Y FA M O U S

HOSTING SERVICE
EGIT
E M F C O M PA R E
C O M PA R E

MERGE
TEAM MODELING

CHALLENGES
A

C

D
B
G

E

F
A

C

D
B
G

E

F
A

B

C

D
G

E

F
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
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
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
KILLING TWO PIGS WITH THE SAME

(ANGRY) BIRD
WE ARE

LIGHTWEIGHT
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
WE ARE

FA S T
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
Time

Number of
changed resources
WHAT YOU SHOULD

REMEMBER

+
E M F C O M PA R E

EGIT
ENABLES

MODELING IN A
TEAM ENVIRONMENT
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
Modeling in a Team Environment with EMF Compare and EGit
Modeling in a Team Environment with EMF Compare and EGit
Modeling in a Team Environment with EMF Compare and EGit
Modeling in a Team Environment with EMF Compare and EGit
Modeling in a Team Environment with EMF Compare and EGit
Modeling in a Team Environment with EMF Compare and EGit
Modeling in a Team Environment with EMF Compare and EGit
Upcoming SlideShare
Loading in …5
×

Modeling in a Team Environment with EMF Compare and EGit

683 views

Published on

Presented at the Polarsys Day, December 3rd, 2013

Published in: Technology
  • Be the first to comment

Modeling in a Team Environment with EMF Compare and EGit

  1. 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. 2. GIT
  3. 3. CREATED BY LINUS T O R VA L D
  4. 4. AS A REPLACEMENT FOR BITKEEPER
  5. 5. GIT IS DISTRIBUTED
  6. 6. PRIMARY SCM OF THE ECLIPSE F O U N D AT I O N SINCE 2011
  7. 7. P O P U L A R I Z E D B Y FA M O U S HOSTING SERVICE
  8. 8. EGIT
  9. 9. E M F C O M PA R E
  10. 10. C O M PA R E MERGE
  11. 11. TEAM MODELING CHALLENGES
  12. 12. A C D B G E F
  13. 13. A C D B G E F
  14. 14. A B C D G E F
  15. 15. 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
  16. 16. 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
  17. 17. 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
  18. 18. KILLING TWO PIGS WITH THE SAME (ANGRY) BIRD
  19. 19. WE ARE LIGHTWEIGHT
  20. 20. 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
  21. 21. WE ARE FA S T
  22. 22. 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
  23. 23. Time Number of changed resources
  24. 24. WHAT YOU SHOULD REMEMBER + E M F C O M PA R E EGIT
  25. 25. ENABLES MODELING IN A TEAM ENVIRONMENT
  26. 26. 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

×