Seminário de Andamento Módulo: Merge Grupo 5 André Ribeiro Coelho Rafael de Souza Santos

2 Módulo: Merge Responsabilidade Possibilitar a junção de ramos assim como a junção de desenvolvimento paralelo nos espaços de trabalho Clientes Espaço de trabalho API Servidor Dependências Algoritmos de diff e patch

3 Dependência Diff Unified Format --- lao :30: tzu :30: ,7 +1,6 -The Way that can be told of is not the eternal Way; -The name that can be named is not the eternal name. The Nameless is the origin of Heaven and Earth; -The Named is the mother of all things. +The named is the mother of all things. + Therefore let there always be non-being, so we may see their subtlety, And let there always be being, -9,3 +8,6 The two are the same, But after they are produced, they have different names. +They both may be called deep and profound. +Deeper and more profound, +The door of all subtleties!

4 Dependência Diff Unified Format (FullContext) --- lao :30: tzu :30: The Way that can be told of is not the eternal Way; -The name that can be named is not the eternal name. The Nameless is the origin of Heaven and Earth; -The Named is the mother of all things. +The named is the mother of all things. + Therefore let there always be non-being, so we may see their subtlety, And let there always be being, so we may see their outcome. The two are the same, But after they are produced, they have different names. The two are the same, +They both may be called deep and profound. +Deeper and more profound, +The door of all subtleties!

5 Merge Three-way lao.txt tzu1.txt tzu2.txt

6 Merge Diff-apply lao.txt tzu1.txt tzu2.txt result.txt

7 Conflitos Representação The Nameless is the origin of Heaven and Earth; The named is the mother of all things. Therefore let there always be non-being, teste so we may see their subtlety, And let there always be being, so we may see their outcome. <<<<<<< tzu1.txt The two are the same, xxxxx ======= The two are the same, yyyyy >>>>>>> tzu2.txt But after they are produced, they have different names. They both may be called deep and profound. Deeper and more profound, The door of all subtleties!

8 Conflitos Avaliação The Nameless is the origin of Heaven and Earth; The named is the mother of all things. Therefore let there always be non-being, teste so we may see their subtlety, And let there always be being, so we may see their outcome. <<<<<< tzu1.txt The two are the same, xxxxx ===1=== The two are the same, yyyyy >>>>>>> tzu2.txt But after they are produced, they have different names. They both may be called deep and profound. Deeper and more profound, The door of all subtleties! 1 – Muito Fácil 2 – Fácil 3 – Médio 4 – Difícil 5 – Muito Difícil

Seminário de Andamento Módulo: Merge Grupo 5 André Ribeiro Coelho Rafael de Souza Santos