ࡱ > bjbjUU A" ? ? X + hG hG T T T T T T T T 8 T U T U #U 9U 9U 9U 9U OU [U - T cU 9U 9U cU cU T T 9U 9U cU cU cU cU T 9U T 9U p cU cU cU cU g 2 9U +~ T cU N 0 8 cU 2 2 ( T Z cU cU cU cU cU cU cU cU cU cU cU cU cU cU cU cU cU cU cU cU cU cU cU cU cU hG qS : Resumo
Quando diversos desenvolvedores alteram um software em paralelo, em algum momento as alteraes concorrentes precisam ser reintegradas (i.e., sofrer merge) ao software em desenvolvimento. Diversas tcnicas de merge foram propostas, mas nenhuma delas resolve de forma automtica todos os casos possveis. Na verdade, de 10 a 20% dos casos de merge falham por conta de conflitos. Nestes casos, os desenvolvedores devem intervir manualmente para resolv-los. Atualmente poucas informaes sobre a natureza dos conflitos de merge so conhecidas. H diversas questes de pesquisa em aberto, como, por exemplo: (1) qual a quantidade de regies em conflito por merges que falharam? (2) qual a quantidade de linhas de cdigo nas regies em conflito? (3) quantos constructos da linguagem existem em cada regio em conflito? (4) quais os padres entre constructos da linguagem podem ser observados nas regies em conflito? (5) qual a distribuio de decises dos desenvolveres na resoluo das regies em conflito? (6) qual a dificuldade de resoluo dos tipos de conflitos encontrados? (7) quais padres entre constructos da linguagem e decises dos desenvolvedores podem ser observados nas regies em conflito? (8) qual a correlao entre a quantidade de desenvolvedores e o nmero de commits, merges e merges que falharam? Para responder estas perguntas, nesta Tese realizamos um estudo quantitativo e qualitativo detalhado da natureza de merges por meio da: (1) anlise dos conflitos de merge de milhares de projetos open source; (2) coleta e classificao das resolues que os desenvolvedores utilizaram para tratar conflitos; e (3) anlise das relaes entre vrios aspectos dos conflitos de merge e a estratgia de resoluo. As respostas a essas questes de pesquisa deram origem a recomendaes que podem apoiar desenvolvedores de ferramentas de merge a tratar alguns tipos de conflitos automaticamente ou aprimorar o processo de merge. Finalmente, como uma prova de conceito, uma das recomendaes identificadas durante as anlises foi implementada e avaliada, apresentando resultados promissores.
Palavras-chave: Merge de Software, Conflitos de Merge, Resoluo de Merge
Abstract
When multiple developers change a software system in parallel, these concurrent changes need to be merged to appear together in the software being developed. Numerous merge techniques have been proposed to support this task, but none of them can fully automate the merge process. Indeed, it has been reported that some 10 to 20% of all merge attempts result in a merge conflict, meaning that a developer has to intervene to manually complete the merge. To date, we have little insight into the nature of these merge conflicts. Multiple research questions are still open, such as: (1) what is the distribution in number of conflicting chunks for merge failures? (2) What is the distribution in size of conflicting chunks, as measured in lines of code (LOC)? (3) What is the distribution in language constructs involved in conflicting chunks? (4) What, if any, patterns exist in the language constructs of failed merges involving multiple conflicting chunks? (5) What is the distribution of developer decisions? (6) What is the distribution in difficulty level of kinds of conflicting chunks? (7) What, if any, patterns exist between the language constructs of conflicting chunks and developers decisions? (8) What is the correlation between the number of developers and the number of commits, merges, and failed merges? This thesis contributes with an in-depth quantitative and qualitative study of merge conflicts by: (1) dissecting the merge conflicts found in the histories of thousands of open source projects, (2) collecting and classifying the manual resolution strategies that developers used to address these merge conflicts, and (3) analyzing the relationships between various aspects of the merge conflicts and the chosen resolution strategies. Our findings give rise to three primary recommendations for future merge techniques, that when implemented can help automatically resolve certain types of conflicts and provide the developer with tool-based assistance to more easily resolve other types of conflicts. Finally, as a proof of concept, we implemented one of our recommendations in a tool. The evaluation of this proof-of-concept tool showed promising results.
Keywords: Software Merge, Merge Conflict, Merge Resolution.
PAGE \* MERGEFORMAT 1
= B ; < ' + M N O S F c 쮣 h g hR'E h{1H hR'E hn hR'E h{1H hR'E hR'E B*ph h g hR'E B*ph h g hR'E 5;CJ \aJ hb.6 hR'E 5\mHsH hR'E mHsH hb.6 hR'E 6]mHsH hb.6 hR'E mHsH %hb.6 hR'E 5;CJ \aJ mHsH 2 ; < V W X Z [ ] ^ ` a d gdWK $ d ` a$ gdx D gd $ d ` a$ gd $ d a$ gd ` gd gd `gd
$ h` a$gd Z f { $ U V X Y [ \ ^ _ a b d e | } ~ hR'E mH nH uhR'E j hR'E Uh g hR'E ; h g hR'E hR'E B*ph h g hR'E B*ph a c d $ d ` a$ gdx # # $a$ d gdWK ? 0 P 1h:pj . A!"n#$n% Dp j 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 2 0 @ P ` p 2 ( 0 @ P ` p 0 @ P ` p 0 @ P ` p 0 @ P ` p 0 @ P ` p 0 @ P ` p 8 X V x OJ PJ QJ _HmHnHsHtH \ ` \ . N o r m a l $dh `a$ CJ OJ QJ _HaJ mH sH tH b b R% 0 H e a d i n g 1 $$$
& F h@& a$ 5;CJ PJ \aJ tH X X R% 0 H e a d i n g 2 $$
& F x @& 5;PJ \tH ` ` R% 0 H e a d i n g 3 $$
& F x @& 5;PJ \mHsHtH ` ` R% 0 H e a d i n g 4 $$
& F x @& 5;PJ \mHsHtH ` ` R% 0 H e a d i n g 5 $$
& F x @& 5;PJ \mHsHtH ` ` R% 0 H e a d i n g 6 $$
& F x @& 5;PJ \mHsHtH ` ` R% 0 H e a d i n g 7 $$
& F x @& 5;PJ \mHsHtH ` ` R% 0 H e a d i n g 8 $$
& F x @& 5;PJ \mHsHtH | | =* 0 H e a d i n g 9 , S o u r c e c o d e f i n a l d @&` CJ OJ QJ ^J aJ tHD A D 0 D e f a u l t P a r a g r a p h F o n t R i R 0 T a b l e N o r m a l 4
l 4 a ( k (
0 N o L i s t Z / Z R% 0 H e a d i n g 1 C h a r % 5;CJ OJ PJ QJ \aJ mH sH Z / Z R% 0 H e a d i n g 2 C h a r % 5;CJ OJ PJ QJ \aJ mH sH R / R K' 0 H e a d i n g 3 C h a r 5;CJ OJ PJ QJ \aJ R / !R K' 0 H e a d i n g 4 C h a r 5;CJ OJ PJ QJ \aJ R / 1R K' 0 H e a d i n g 5 C h a r 5;CJ OJ PJ QJ \aJ R / AR K' 0 H e a d i n g 6 C h a r 5;CJ OJ PJ QJ \aJ R / QR K' 0 H e a d i n g 7 C h a r 5;CJ OJ PJ QJ \aJ R / aR K' 0 H e a d i n g 8 C h a r 5;CJ OJ PJ QJ \aJ / q =* 0% H e a d i n g 9 C h a r , S o u r c e c o d e f i n a l C h a r CJ OJ QJ ^J aJ mH sH tH b / b Ds 0 T t u l o s d 7$ 8$ H$ # 5B*CJ \aJ mH ph sH tH ^ / ^ g1H 0 T e x t o S i m p l e s dh # 5B*CJ OJ QJ \_HaJ ph T /T Ds 0 T t u l o s C h a r # 5B*CJ OJ QJ \^J aJ ph R /R M 0
F i g u r a E t a b e l a CJ OJ QJ aJ mH sH tH ^ /^ g1H 0 T e x t o S i m p l e s C h a r # 5B*CJ OJ QJ \_HaJ ph ` /` M 0 F i g u r a E t a b e l a C h a r # 5B*CJ OJ QJ \^J aJ ph : : jI 0
B o o k T i t l e
5:@ \ B B jI 0 P l a c e h o l d e r T e x t B*ph Z Z ! jI 0 B a l l o o n T e x t d CJ OJ QJ ^J aJ mHsHtHN / N jI 0 B a l l o o n T e x t C h a r CJ OJ QJ ^J aJ D /"D % k 0 F i g u r a s " $a$ CJ aJ mH sH tH : @ 2: $ mB 0 H e a d e r #
8!d . / A. # mB 0 H e a d e r C h a r T /QT " k 0 F i g u r a s C h a r # 5B*CJ OJ QJ \^J aJ ph : b: ' WK 0 F o o t e r &
8!d . / q. & WK 0 F o o t e r C h a r N /N * g1H 0 S e o ( $dh a$ ;CJ aJ mH sH tH F /F + Ds 0 S u b - s e o ) CJ aJ mH sH tH R /R ( g1H 0
S e o C h a r & 5;B*CJ OJ QJ \^J aJ ph Z /Z ) Ds 0 S u b - s e o C h a r & 5;B*CJ OJ QJ \^J aJ ph 8 /!8 . h 0 T a b e l a , ( mH sH tH h 0
T a b l e G r i d I :V- 0 a k
- CJ ^J aJ R /R , h 0 T a b e l a C h a r # 5B*CJ OJ QJ \^J aJ ph 2 a2 0 a 0 R o d a p 1
/ ^ . r. / a 0 R o d a p C h a r Z Y Z 2 D 0 D o c u m e n t M a p 1 d CJ OJ QJ ^J aJ mHsHtHN / !N 1 D 0 D o c u m e n t M a p C h a r CJ OJ QJ ^J aJ B ' 1B _R 0 C o m m e n t R e f e r e n c e CJ aJ N BN 5 _R 0 C o m m e n t T e x t 4 d CJ aJ mHsHtHN / QN 4 _R 0 C o m m e n t T e x t C h a r CJ OJ QJ ^J aJ @ j AB@ 7 _R 0 C o m m e n t S u b j e c t 6 5\F /RqF 6 _R 0 C o m m e n t S u b j e c t C h a r 5\@ @ p 0 L i s t P a r a g r a p h
8 ^ p 0 M e d i u m G r i d 3 - A c c e n t 4 >:V9 0 a jQ@
jQ
jQ
d j;
d jQ
d jQ
d k
44 9 t CJ ^J aJ 56 B*\] ph 56 B*\] ph 56 B*\] ph 56 B*\] ph p 0 M e d i u m G r i d 3 - A c c e n t 2 >:V: 0 a jQ@
ߧ jQ
ߧ jQ
PM j;
PM jQ
PM jQ
PM k
44 : t CJ ^J aJ 56 B*\] ph 56 B*\] ph 56 B*\] ph 56 B*\] ph H " H g D 0 C a p t i o n ; $ d ` a$ 5\<
< gJ 0 T O C H e a d i n g <
& F @& \ \
=* 0 T O C 1 , N e w s o u r c e c o d e = $$
e#
` : :
sx 0 T O C 2 >
e#
d ^ 2 2
B 0 T O C 3 ? d ^ 6 U 6 B 0 H y p e r l i n k >*B*ph < # <
0 T a b l e o f F i g u r e s A / " C O 0 R e f e r n c i a s B i b l i o g r f i c a s ( B d x 1$ 7$ 8$ H$ ^ ` mH sH tH j /1j B O 0 R e f e r n c i a s B i b l i o g r f i c a s C h a r CJ OJ QJ ^J aJ F A F B 0 B i b l i o g r a p h y D d ` D RD F R% 0
F o o t n o t e T e x t E d CJ aJ T / aT E R% 0 F o o t n o t e T e x t C h a r OJ QJ ^J mH sH tH @ & q@ R% 0 F o o t n o t e R e f e r e n c e H* Z ^ Z R% 0 N o r m a l ( W e b ) $ H $ d d d [$\$` a$ PJ T / T J R% 0 b o d y I d 1$ ` B*CJ OJ QJ aJ ph tH T /T I R% 0 b o d y C h a r ) B*CJ OJ QJ ^J aJ mH ph sH tH L L R% 0 R e v i s i o n K CJ OJ QJ _HaJ mH sH tH > * > R% 0 E n d n o t e R e f e r e n c e H* L / L N R% 0 T a b l e M $$ d 1$ `
B*ph tH V /V M R% 0
T a b l e C h a r ) B*CJ OJ QJ ^J aJ mH ph sH tH /
P !i| 0 C o d e Z O $$ d $d %d &d 'd N O P Q ` CJ OJ PJ QJ aJ tH N /N O !i| 0 C o d e C h a r $ CJ OJ PJ QJ ^J aJ mH sH tH P P R% 0 A u t h o r Q $ d x ` a$ OJ PJ QJ ^J h "h R% 0 P a p e r - T i t l e R $ d x ` a$ 5CJ$ OJ PJ QJ \^J aJ$ ` 2` R% 0 A f f i l i a t i o n s S $ d ` a$ CJ OJ PJ QJ ^J aJ N BN R% 0 B u l l e t T pd x ^ `p CJ PJ aJ , R, R% 0 E - M a i l U < d bd R% 0 A b s t r a c t V $$
& F d x @& a$ 5;CJ KH PJ \aJ \ ; r\ R% 0
L i s t N u m b e r 3 W 8d x ^8` CJ PJ aJ j j R% 0 C a p t i o n s - X $ d x H+Dp/ 0$` a$ 5CJ PJ \aJ X / X b R% 0
R e f e r e n c e s Y $
& F d x a$ CJ PJ aJ tH . ) . R% 0 P a g e N u m b e r V C V \ R% 0 B o d y T e x t I n d e n t [ hd `h CJ PJ aJ b / b [ R% 0 B o d y T e x t I n d e n t C h a r CJ OJ QJ ^J aJ mH sH tH b B b ^ R% 0 B o d y T e x t * ] d /H&+D@/ 0$` CJ PJ aJ T / T ] R% 0 B o d y T e x t C h a r CJ OJ QJ ^J aJ mH sH tH F V F R% 0 F o l l o w e d H y p e r l i n k >*B* ph 6 6 c R% 0
R e f e r e n c e s A C M ` / d R% 0) M e d i u m G r i d 2 - A c c e n t 2 1 , R Q p r e s e n t a t i o n ! a
& F
h d 1$ ` + 6B*CJ KH OJ PJ QJ ]aJ ph tH R /!R Y R% 0 R e f e r e n c e s C h a r CJ OJ PJ QJ aJ mH sH < "1< ` R% 0 R e f e r e n c e s A C M C h a r /A a R% 03 M e d i u m G r i d 2 - A c c e n t 2 1 C h a r , R Q p r e s e n t a t i o n C h a r 7 6B*CJ KH OJ PJ QJ ]^J aJ mH ph sH tH ` R` f R% 0 F i g u r e e dL @1$ ` ! B*CJ OJ PJ QJ ^J aJ ph X aX e R% 0 F i g u r e C h a r ) B*CJ OJ QJ ^J aJ mH ph sH tH R X qR R% 0 E m p h a s i s , T a b l e d e s c r i p t i o n 6]4 4 0 0 C a b e a l h o C h a r \ /\ 0 0 T e x t o d e c o m e n t r i o C h a r CJ OJ QJ ^J aJ < < k . 0 Q u o t e j ^ ` 6]\ / \ j . 0
Q u o t e C h a r / 6B*CJ OJ QJ ]^J aJ mH ph sH tH D D . 0 P A R A G R A P H l d 1$ ` PJ N N . 0 P A R A G R A P H ( n o i n d e n t )
m ` N /N . 0 P r o g r a m C o d e B*
CJ OJ
QJ
^J
aJ ph J /J . 0 T a b l e ( r e f e r e n c e t o ) B*ph b b . 0
A R T I C L E T I T L E p $d *$a$ @ CJ0 OJ QJ ^J aJ0 > > . 0 A U T H O R q d @ CJ aJ b "b . 0 T A B L E F O O T N O T E r $ d 1$ ` a$ 6CJ PJ ]aJ l 2l . 0 A B S T R A C T - s $ d. *$]^` a$ CJ OJ QJ ^J aJ f Bf . 0 T A B L E R O W ! t $ dL 1$ ` a$ CJ OJ PJ QJ ^J aJ R ABR . 0 T A B L E C O L U M N H E A D E R
u ( ( CJ aJ | R| . 0 T A B L E T I T L E / v $$ d8 P o&1$ ` a$ :B*OJ PJ QJ ^J ph V rV . 0 F I G U R E C A P T I O N w dL @ CJ OJ QJ ^J aJ f f . 0 Q U O T A T I O N B L O C K S T Y L E x P P ] ^ CJ aJ J J . 0 L I S T T Y P E 2 a ( N u m b e r ) y P D D . 0 L I S T T Y P E 2 ( N u m b e r ) z b /b . 0 L I S T T Y P E 1 ( B u l l e t ) {
& F
@ ^` b b . 0 B I B . R E F . T E X T # |
hdL 1$^h` CJ aJ b b . 0 C C C L I N E } $d` ;&P#$. a$ @ CJ OJ QJ ^J aJ . 0 P R O G R A M S E G M E N T n ~ $
M X x@` (
H
h0 d8 ] ^ a$ CJ OJ
QJ
^J
aJ J J . 0 L I S T T Y P E 1 a ( B u l l e t ) P J J . 0 L I S T T Y P E 2 z ( N u m b e r ) P F F . 0 V I T A
dL CJ OJ QJ ^J aJ J J . 0 L I S T T Y P E 1 z ( B u l l e t ) P L 2L . 0 F I G U R E B O D Y dL CJ OJ QJ ^J aJ N BN . 0 F O R M U L A ! $ d P P 1$ ` a$ PJ < Q< . 0 U r l B* CJ OJ QJ ^J aJ ph r . 0 A C K . H E A D : $ $
hhd @P *$1$ @& ^h`a$ :;CJ OJ PJ QJ ^J aJ : r: . 0 A C K N O W L E D G M E N T S H H . 0 A R T $ $$ d 1$ ` a$ PJ ` ` . 0 A U T H O R A F F I L I A T I O N dL . 6CJ ]aJ . 0 B I B . H E A D : $ $
hhd @P *$1$ @& ^h`a$ :;CJ OJ PJ QJ ^J aJ 4 /4 . 0 B i b . R e f . B* ph 0 0 . 0
C O N C L U S I O N L /L . 0 F i g u r e ( r e f e r e n c e t o ) B*ph \ Q\ . 0 F O O T N O T E & dV #$. 1$ ` CJ PJ aJ \ r\ . 0 F o o t n o t e ( r e f e r e n c e t o ) B* CJ EHaJ ph 4 4 . 0 I N T R O D U C T I O N 0 1 0 . 0 K E Y W O R D F ! F . 0
M e m b e r T y p e 6CJ OJ QJ ]^J aJ X 2 X . 0 F i g u r e C a p t i o n d 7$ 8$ ` CJ PJ aJ H B H . 0 T e x t d 1$ 7$ 8$ ` CJ PJ aJ X X . 0 E q u a t i o n !
d 1$ 7$ 8$ ` CJ PJ aJ b . 0 R e f e r e n c e H e a d 1 $
h d P 7$ 8$ ^ ` 5:;CJ KH PJ \aJ \ r \ . 0 T a b l e T i t l e $ d 7$ 8$ ` a$ :CJ PJ aJ @ W @ . 0 S t r o n g , T a b l e c o n t e n t \ / \ . 0 A f f i l i a t i o n $a$$ CJ OJ PJ QJ _HaJ mH sH tH / . 0 b u l l e t l i s t G
& F
@d x & +D / 0$ ^@` @CJ PJ aJ l l . 0 e q u a t i o n ) $
d ` a$ CJ OJ PJ QJ ^J aJ z / z . 0 f i g u r e c a p t i o n $
P a$+ CJ OJ PJ QJ _HaJ mH nH sH tH u j / j . 0 f i g u r e c a p t i o n C h a r + CJ OJ PJ QJ _HaJ mH nH sH tH u r / r . 0 f o o t n o t e #
& F ( A&#$. / $ CJ OJ PJ QJ _HaJ mH sH tH x / x . 0 k e y w o r d s $x `a$7 56CJ OJ PJ QJ \]_HaJ mH nH sH tH u n /
n . 0 p a p e r s u b t i t l e $x a$+ CJ OJ PJ QJ _HaJ mH nH sH tH u h /
h . 0 p a p e r t i t l e $x a$+ CJ0 OJ PJ QJ _HaJ0 mH nH sH tH u t /"
t . 0
r e f e r e n c e s $
& F! dL 2 a$ + CJ OJ PJ QJ _HaJ mH nH sH tH u r /2
r . 0 s p o n s o r s # g$d N ` $ CJ OJ PJ QJ _HaJ mH sH tH ^ B
^ . 0 t a b l e c o l h e a d $ d ` a$ 5CJ PJ \aJ L A
R
L . 0 t a b l e c o l s u b h e a d 6CJ ]aJ b /b
b . 0
t a b l e c o p y $a$+ CJ OJ PJ QJ _HaJ mH nH sH tH u /r
. 0 t a b l e f o o t n o t e ' $
& F"
h< ^ha$ $ CJ OJ PJ QJ _HaJ mH sH tH r /
r . 0
t a b l e h e a d $d x a$. :CJ OJ PJ QJ _HaJ mH nH sH tH ud /
d . 0 t a b l e h e a d C h a r . :CJ OJ PJ QJ _HaJ mH nH sH tH u /!
. 0 R e s e a r c h Q u e s t i o n ' $
& F
hd x a$ + :;B*CJ KH OJ PJ QJ ^J aJ ph l /
l . 0 R e s e a r c h Q u e s t i o n C h a r ( :B*CJ KH OJ PJ QJ ^J aJ ph H
H . 0 D o c u m e n t M a p C h a r 1 CJ KH aJ /
. 0 L i s t T a b l e 6 C o l o r f u l 1 a :V 0 4 4
l k
44 ! B*PJ ^J _HmH ph sH tH 4
4 . 0 r e n d e r e d _ q t e x t 6 6 . 0
I n t e n s e Q u o t e \ / \ . 0 I n t e n s e Q u o t e C h a r CJ OJ QJ ^J aJ mH sH tH * * 55 0 h i g h l i g h t H " H ( 0 p 1 $ d ` a$ CJ OJ QJ ^J aJ @
@
0 I n d e x 1 d ^ ` 2 2
0 T O C 4 d ^ PK ! [Content_Types].xmlj0Eжr(Iw},-j4 wP-t#bΙ{UTU^hd}㨫)*1P' ^W0)T9<l#$yi} ;~@(Hu* Dנz/0ǰ $ X3aZ,D0j~3߶b~i>3\`?/[G\!-Rk.sԻ..a濭? PK ! ֧ 6 _rels/.relsj0 }Q%v/C/} (h"O
= C?hv=Ʌ%[xp{۵_Pѣ<1H0ORBdJE4b$q_ 6LR7`0̞O,En7Lib/Se е PK ! ky theme/theme/themeManager.xml M
@}w7c(Ebˮ CAǠҟ7՛K
Y,
e.|,H ,lxɴIsQ}#Ր ֵ+!,^$j=GW)E+&
8 PK ! P theme/theme/theme1.xmlYOo6w toc'vuر-Mn iP@I}úama[إ4:l ЯGRX^6؊>$ !)O^rC$y@ /yH*)UDb`}"qۋJחX^)I`nEp)liV[]1M<OP6r=zgbIguSe bORD۫qu gZo~ٺlAplxpT0+[}`j zA V2Fi@qv֬5\|ʜ̭NleXd sjcs7f
W+Ն7` g ȘJj|h(KD-
dXiJ؇(x$( :;˹! I_TS 1?E ??ZBΪmU/ ?~xY'y5g&/ɋ>GMGeD3Vq%'#q$8K )fw 9:ĵ
x}rxwr:\TZaG*y8IjbRc|XŻǿI
u3KGnD 1NIBs
RuK>V.E L+M2#'fi ~V vl{u8z H
* :( W ☕
~JTe\O*tHGHY }KNP*ݾ˦ TѼ9/#A7qZ $*c?qUnwN%Oi4 =3ڗP
1Pm \\9Mؓ2aD];Yt\[x]}Wr|]g-
eW
)6-rC Sj
id DЇAΜIqbJ#x꺃 6k#ASh&ʌt(Q% p%m&]caS l=X\P1Mh9MVdDAaVB[݈fJíP|8 քAV^f
Hn- "d>znNJ ة>b&2vKyϼD:,AGm\nziÙ .uχYC6OMf3or$5N HT[XF64T,ќM0E)`#5XY`פ ;%1U٥m;R>QD DcpU'&LE/pm%]8firS4d 7y\`JnίI R 3U~7+#m qBiDi*L69mY&iHE=(K&N!V.KeLDĕ{D vEꦚdeNƟe(MN9ߜR6&3(a/DUz<{ˊYȳV)9Z[4^n5!J?Q3eBoCM m<.vp IYfZY_p[=al-Y}Nc͙ŋ4vfavl'SA8|*u{-ߟ0%M07% < ҍ PK !
ѐ ' theme/theme/_rels/themeManager.xml.relsM
0wooӺ&݈Э5
6?$Q
,.aic21h:qm@RN;d`o7gK(M&$R(.1r'JЊT8V"AȻHu}|$b{ P8g/ ]QAsم(#L[ PK- ! [Content_Types].xmlPK- ! ֧ 6 + _rels/.relsPK- ! ky theme/theme/themeManager.xmlPK- ! P theme/theme/theme1.xmlPK- !
ѐ ' theme/theme/_rels/themeManager.xml.relsPK ]
" * * * * * -
a $ & - ! _ G o B a c k W W $ ؖ ~\ lqap n{ u)`! ^ @ b$ &bi3 ZG( z- 6f7`qx +Vv?b(_ >`A9 78A x E(B涫 qF 9sI. D=NJ⺀ lNVv| `A JTR U| q lq D=N TX qF P7z @ `^ ``OJ QJ ^J o( $ $ `y B gJ sT 5i zi iu m 05 /L 0 0 ]M X Cs v A| 0 ! * l/ 0 J9 S ed . V
Y ` a 6 | ^@ oZ ` a d y
V3 I T X ~^ Se h 4 G L j^ {v x -
? RS Vf p ) 3 Bc ^u /y R- 0 0 N O l E{ -} t/ 8 WU X
c Vj K( 5 ! u! ! > ! : ! #?! ?! /@! E! BQ! Q! }! C" D" V" X" _" # j# # 7 # r'# 6# I# `# j# t# $ $ $ C$ H$ T$ W$ m$ fq$ U% % Z% % #% $% R% h\% h% E|% a& & f & %& o=& pA& k& & +' ' "' +9'
=' H' J' K' L' |P' ( ( 0( ;( S( ( F/) ;2) pI) Z) z) z) * * 0* +.* .* u6* h<* m>* u* 2 + m]+ u+ tv+ 4, C, rL, %d, i, p, ~, I- R- h- k- . . . . $. X%. H0. :. vS. &/ ;/ G/ Y/
0 0 0 #0 `$0 e(0 /0 )=0 G0 V0 4r0 s0 u0 1 1 1 1 1 31 NP1 T1 ^1 l1 Px1 2 V2 e2 f2 Sk2 s2 ) 3 3 3 [3 A3 N3 4 &4 aG4 j4 5 5
5 55 < -= I = = != ,= ,= D= F= P'> 5> @> VL> `> b> ? % ? P+? 1? 1? B? 1@ @ %@ t@ A (A EA #EA NA B B GB MB OQB mB C HC ;LC SC 9rC g D K7D LxD s~D wE > E I E : E R'E DE ;QE ?QE VE JhE F F W6F (:F 6FF ,UF !cF bhF %G KG VG ]G YyG Y H H H
H g1H {1H T:H /^H pH zH I ^
I I x I +I |.I 0I wGI [I fI jI rI tI J J YJ J )J bQJ %bJ K
K K K q5K s5K 9K XK kK |K L S L +L M2L #CL lL mL bM M M M #M i#M 7M @:M XM >^M eM qM sM N N e N TN `N `pN 4O O 8O ?O FZO 3`O taO qO tO P w,P 6P [P jP ~P XQ $!Q Z'Q (Q K;Q =Q FQ HQ UQ WQ "`Q pQ R R RIR ZR _R :{R
S S 'S 7S NS fS J|S U-T 6T 9T /FT gT |T U U H*U X:U QCU DU .LU obU nU 2 V 0%V MV ZV oV P
W 3W 9W AW 6VW tW 3X QX XX dX eX qY Y ;Y CY NY OUY 6Z j Aj DGj p\j lj $k r/k >k F]k ]k bk g l *l .l /l ml ql {l {(m +8m >m Em Wm em hm n
n n Y*n Fn Tn o
o )7o 8o Ao so p #p p
p 8p 'q Fq Iq Lr r f-r :r \r ^br :mr s ,s [9s :s Ds VRs rs t t k$t Jt 3_t ht Wu u
*u *u 7?u a]u du iu |u Y v HOv [v dv iv uv }v ~v w 0w v6w Xw ]w !aw gw Fx XUx Zx sx Ty ,y 0.y uLy Qy Qy ey gy iy vy
z
z z z $z +7z F wl n ey + A L M u } } !W 5X xg k ~ 2 2 ]8 9 nY t U~ I K 4a Qh D c* [, 9 E 1Y y $6 7V 8e n " 5 ? A J ] a 2~ l lW u a 0 7d :w x y { | X d0 '] jb ; ML dW O~ ! , . y1 = @ I
M T ,` e ` -< 8> *a Tb p q , / A` go o p dy ~ u
a} r , ) )G e e m P' / .* j6 9 'k ku v| W) - : O Q t / 9 b h v F & :8 a Re J% 5, 'I +N N v0 >5 > X 8 n -) 2/ Y1 = = > B n {{ 8% 8 K N su z } O + 1 BB D V bZ q X< = A /J wY i 2
6 ? U }s " G ^ <_ =r t ~ ! # pC I V[ k Z $
r x ~ w \3 G +V ] g @H }m z NH )a > GG ~e q * b F 1 > p] _ { 5 -; ,F D[ $b ' u* 25 I8 f? L $N % 7 [O Z @s >8 3C d r
P; C 7D | 4& , ,. > U r[ z E A
= A E } ` \ ` E+ . b; \G Y _ o } 9 M 0_ de f 5h n L ; |*
K SQ SZ [ 4d op J Y@ zB ^ 6 DJ Y c ~k \~ B [ Ew ] 1 8 a o l i !% F L` =n xn . 4 tN ` x
[ n * . ; $ > A W b% % & Y o\ !b y { ( H( ?* D 7S p x + D QM M N 7 3 H7 1C L AS ` e
' T V g ? P yS V A| ' 9 > IK N c 1 4 E @P S h Ey g2 M\ g j W B
" S% // 0 F W [ e t Fz V/ n z }! 9 > Y i P . 5 rR f j ~ 5 A E NF i i Y M ` y z x | " =* F >a x z + 3 9F SS dX f_ 0j 0x , :; 3@ C rc e s B p w -4 6 @ e W
s1 5 8 9 E
G Z }u
i L T z# ( ( $< T z\ ] h t N "d & 86 l cv 0 b1 ? J RS k |p t * q Q PD ] } I 4 s {@ N g[ Xi | ( ` 9b u 0 t3 u 8 WK s v v { \ e ' t W
K O DS ^ 4` a ! ) + - F0 "4 O { X K 9 > z\ ` Om { ' k u t& ( y0 5 7 8 rO c % O Z [ i k l o V ! J | > # w- 1 B C bL \V W a y )} H% < $V z } 3 j |. 55 F v y $ *; `_ o 4 6; > X? .D nV ! ") Z p- < Z k o cp u S :
! L Ba i T * z/ A PM h
%% l. Z j 7 ` W X Z _ _ G r a m m a r l y _ 4 2 _ _ _ _ i # _ _ G r a m m a r l y _ 4 2 _ _ _ 1 z4 H 4 s I A A A A A A A E A K t W c k k s S Q x I L C p x z i / N K 1 G y M q w F A A E h o T I T A A A A T H 4 s I A A A A A A A E A K t W c s l P 9 k x R s l I y N D Y 0 M j Q 1 M T Q 0 N T Q w N D O 0 N D Z Q 0 l E K T i 0 u z s z P A y k w M q g F A L s 1 Y N E t A A A A @ @ @ U n k n o w n G * Ax T i m e s N e w R o m a n 5 S y m b o l 3. * Cx A r i a l 7. @ C a l i b r i K M S G o t h i ~ ? ? e g ?= * Cx C o u r i e r N e w ;. * Cx H e l v e t i c a 5. . [` ) T a h o m a Q=
j M S M i n c h o ? l ? r ? ? f c 9 P a l a t i n o Q
P r o g r a m T h r e e C a l i b r i c H e l v e t i c a C o n d e n s e d H e l v e t i c a ; W i n g d i n g s A C a m b r i a M a t h " *R*Rc Rg ! x 0 $P X p, !
x x ' T e m p l a t e d e D i s s e r t a e s e T e s e s d a U F F G l e i p h M e n e z e s H e l i o $
! " # Oh +'0 $ 4 @
d p |
( Template de Dissertaes e Teses da UFF Gleiph Menezes Normal_Wordconv Helio 2 Microsoft Office Outlook @ F# @ |@ +~@ +~ ՜. +,D ՜. +,T h p |
( Template de Dissertaes e Teses da UFF Title ( X ` h ZOTERO_PREF_1 ZOTERO_PREF_2 h
! " # $ % & ' ( ) * + , - . / 0 1 2 3 4 5 6 7 8 9 : ; < = > ? @ A B C D E F G H I J K L M N O P Q R S T U V W X Y Z [ \ ] ^ _ ` a b c d e f g h i j k l m n o p q r s t u v w x z { | } ~ R o o t E n t r y F p=+~ 1 T a b l e g W o r d D o c u m e n t A" S u m m a r y I n f o r m a t i o n ( y D o c u m e n t S u m m a r y I n f o r m a t i o n 8 C o m p O b j y
F' Microsoft Office Word 97-2003 Document
MSWordDoc Word.Document.8 9q
F# Documento do Microsoft Office Word
MSWordDoc Word.Document.8 9q