-
Notifications
You must be signed in to change notification settings - Fork 1
/
conflitos.html
628 lines (534 loc) · 22.8 KB
/
conflitos.html
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8" />
<meta name="generator" content="pandoc" />
<meta http-equiv="X-UA-Compatible" content="IE=EDGE" />
<meta name="author" content="Gabriel Nakamura" />
<meta name="date" content="2024-07-16" />
<title>Resolução de conflitos de versão</title>
<script src="site_libs/header-attrs-2.26/header-attrs.js"></script>
<script src="site_libs/jquery-3.6.0/jquery-3.6.0.min.js"></script>
<meta name="viewport" content="width=device-width, initial-scale=1" />
<link href="site_libs/bootstrap-3.3.5/css/flatly.min.css" rel="stylesheet" />
<script src="site_libs/bootstrap-3.3.5/js/bootstrap.min.js"></script>
<script src="site_libs/bootstrap-3.3.5/shim/html5shiv.min.js"></script>
<script src="site_libs/bootstrap-3.3.5/shim/respond.min.js"></script>
<style>h1 {font-size: 34px;}
h1.title {font-size: 38px;}
h2 {font-size: 30px;}
h3 {font-size: 24px;}
h4 {font-size: 18px;}
h5 {font-size: 16px;}
h6 {font-size: 12px;}
code {color: inherit; background-color: rgba(0, 0, 0, 0.04);}
pre:not([class]) { background-color: white }</style>
<script src="site_libs/jqueryui-1.13.2/jquery-ui.min.js"></script>
<link href="site_libs/tocify-1.9.1/jquery.tocify.css" rel="stylesheet" />
<script src="site_libs/tocify-1.9.1/jquery.tocify.js"></script>
<script src="site_libs/navigation-1.1/tabsets.js"></script>
<script src="site_libs/navigation-1.1/codefolding.js"></script>
<script src="site_libs/navigation-1.1/sourceembed.js"></script>
<script src="site_libs/clipboard-1.7.1/clipboard.min.js"></script>
<link href="site_libs/primer-tooltips-1.4.0/build.css" rel="stylesheet" />
<link href="site_libs/klippy-0.0.0.9500/css/klippy.min.css" rel="stylesheet" />
<script src="site_libs/klippy-0.0.0.9500/js/klippy.min.js"></script>
<style type="text/css">
code{white-space: pre-wrap;}
span.smallcaps{font-variant: small-caps;}
span.underline{text-decoration: underline;}
div.column{display: inline-block; vertical-align: top; width: 50%;}
div.hanging-indent{margin-left: 1.5em; text-indent: -1.5em;}
ul.task-list{list-style: none;}
</style>
<style type="text/css">
#rmd-source-code {
display: none;
}
</style>
<style type = "text/css">
.main-container {
max-width: 940px;
margin-left: auto;
margin-right: auto;
}
img {
max-width:100%;
}
.tabbed-pane {
padding-top: 12px;
}
.html-widget {
margin-bottom: 20px;
}
button.code-folding-btn:focus {
outline: none;
}
summary {
display: list-item;
}
details > summary > p:only-child {
display: inline;
}
pre code {
padding: 0;
}
</style>
<style type="text/css">
.dropdown-submenu {
position: relative;
}
.dropdown-submenu>.dropdown-menu {
top: 0;
left: 100%;
margin-top: -6px;
margin-left: -1px;
border-radius: 0 6px 6px 6px;
}
.dropdown-submenu:hover>.dropdown-menu {
display: block;
}
.dropdown-submenu>a:after {
display: block;
content: " ";
float: right;
width: 0;
height: 0;
border-color: transparent;
border-style: solid;
border-width: 5px 0 5px 5px;
border-left-color: #cccccc;
margin-top: 5px;
margin-right: -10px;
}
.dropdown-submenu:hover>a:after {
border-left-color: #adb5bd;
}
.dropdown-submenu.pull-left {
float: none;
}
.dropdown-submenu.pull-left>.dropdown-menu {
left: -100%;
margin-left: 10px;
border-radius: 6px 0 6px 6px;
}
</style>
<script type="text/javascript">
// manage active state of menu based on current page
$(document).ready(function () {
// active menu anchor
href = window.location.pathname
href = href.substr(href.lastIndexOf('/') + 1)
if (href === "")
href = "index.html";
var menuAnchor = $('a[href="' + href + '"]');
// mark the anchor link active (and if it's in a dropdown, also mark that active)
var dropdown = menuAnchor.closest('li.dropdown');
if (window.bootstrap) { // Bootstrap 4+
menuAnchor.addClass('active');
dropdown.find('> .dropdown-toggle').addClass('active');
} else { // Bootstrap 3
menuAnchor.parent().addClass('active');
dropdown.addClass('active');
}
// Navbar adjustments
var navHeight = $(".navbar").first().height() + 15;
var style = document.createElement('style');
var pt = "padding-top: " + navHeight + "px; ";
var mt = "margin-top: -" + navHeight + "px; ";
var css = "";
// offset scroll position for anchor links (for fixed navbar)
for (var i = 1; i <= 6; i++) {
css += ".section h" + i + "{ " + pt + mt + "}\n";
}
style.innerHTML = "body {" + pt + "padding-bottom: 40px; }\n" + css;
document.head.appendChild(style);
});
</script>
<!-- tabsets -->
<style type="text/css">
.tabset-dropdown > .nav-tabs {
display: inline-table;
max-height: 500px;
min-height: 44px;
overflow-y: auto;
border: 1px solid #ddd;
border-radius: 4px;
}
.tabset-dropdown > .nav-tabs > li.active:before, .tabset-dropdown > .nav-tabs.nav-tabs-open:before {
content: "\e259";
font-family: 'Glyphicons Halflings';
display: inline-block;
padding: 10px;
border-right: 1px solid #ddd;
}
.tabset-dropdown > .nav-tabs.nav-tabs-open > li.active:before {
content: "\e258";
font-family: 'Glyphicons Halflings';
border: none;
}
.tabset-dropdown > .nav-tabs > li.active {
display: block;
}
.tabset-dropdown > .nav-tabs > li > a,
.tabset-dropdown > .nav-tabs > li > a:focus,
.tabset-dropdown > .nav-tabs > li > a:hover {
border: none;
display: inline-block;
border-radius: 4px;
background-color: transparent;
}
.tabset-dropdown > .nav-tabs.nav-tabs-open > li {
display: block;
float: none;
}
.tabset-dropdown > .nav-tabs > li {
display: none;
}
</style>
<!-- code folding -->
<style type="text/css">
.code-folding-btn { margin-bottom: 4px; }
</style>
<style type="text/css">
#TOC {
margin: 25px 0px 20px 0px;
}
@media (max-width: 768px) {
#TOC {
position: relative;
width: 100%;
}
}
@media print {
.toc-content {
/* see https://github.com/w3c/csswg-drafts/issues/4434 */
float: right;
}
}
.toc-content {
padding-left: 30px;
padding-right: 40px;
}
div.main-container {
max-width: 1200px;
}
div.tocify {
width: 20%;
max-width: 260px;
max-height: 85%;
}
@media (min-width: 768px) and (max-width: 991px) {
div.tocify {
width: 25%;
}
}
@media (max-width: 767px) {
div.tocify {
width: 100%;
max-width: none;
}
}
.tocify ul, .tocify li {
line-height: 20px;
}
.tocify-subheader .tocify-item {
font-size: 0.90em;
}
.tocify .list-group-item {
border-radius: 0px;
}
</style>
</head>
<body>
<div class="container-fluid main-container">
<!-- setup 3col/9col grid for toc_float and main content -->
<div class="row">
<div class="col-xs-12 col-sm-4 col-md-3">
<div id="TOC" class="tocify">
</div>
</div>
<div class="toc-content col-xs-12 col-sm-8 col-md-9">
<div class="navbar navbar-default navbar-fixed-top" role="navigation">
<div class="container">
<div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-bs-toggle="collapse" data-target="#navbar" data-bs-target="#navbar">
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="index.html">Boas Práticas e Ferramentas da Ciência Aberta na Ecologia - BIE5798</a>
</div>
<div id="navbar" class="navbar-collapse collapse">
<ul class="nav navbar-nav">
<li>
<a href="index.html">Início</a>
</li>
<li>
<a href="intro_ciencia_aberta.html">O que é ciência aberta?</a>
</li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" data-bs-toggle="dropdown" aria-expanded="false">
Dados abertos
<span class="caret"></span>
</a>
<ul class="dropdown-menu" role="menu">
<li>
<a href="dados_abertos.html">O que são dados abertos?</a>
</li>
<li>
<a href="metadata_EML.html">Metadados</a>
</li>
</ul>
</li>
<li>
<a href="Organizacao_dir_local.html">Organização local</a>
</li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" data-bs-toggle="dropdown" aria-expanded="false">
Versionamento
<span class="caret"></span>
</a>
<ul class="dropdown-menu" role="menu">
<li>
<a href="basics_git.html">ABC do versionamento</a>
</li>
<li>
<a href="commits-travel.html">Viajando no tempo</a>
</li>
<li>
<a href="gitgnore.html">Ignorando arquivos</a>
</li>
<li>
<a href="colabs_github.html">Trabalho colaborativo</a>
</li>
<li>
<a href="conflitos.html">Resolvendo conflitos</a>
</li>
<li>
<a href="releasing.html">Release</a>
</li>
</ul>
</li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" data-bs-toggle="dropdown" aria-expanded="false">
Programação letrada
<span class="caret"></span>
</a>
<ul class="dropdown-menu" role="menu">
<li>
<a href="rmarkdown-basics.html">Rmarkdown</a>
</li>
<li>
<a href="sites-basics.html">Sites</a>
</li>
</ul>
</li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" data-bs-toggle="dropdown" aria-expanded="false">
Avançado
<span class="caret"></span>
</a>
<ul class="dropdown-menu" role="menu">
<li>
<a href="renv-basics.html">Manejo de versões de pacotes</a>
</li>
<li>
<a href="rocker-basics.html">Containers</a>
</li>
<li>
<a href="targets_basics.html">Fluxo de trabalho</a>
</li>
<li>
<a href="metadata_EML_pratice.html">Metadados com EML</a>
</li>
<li>
<a href="git_large_files.html">Manejo de arquivos grandes</a>
</li>
</ul>
</li>
<li>
<a href="publicacoes.html">Acesso aberto</a>
</li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" data-bs-toggle="dropdown" aria-expanded="false">
Outras tendências
<span class="caret"></span>
</a>
<ul class="dropdown-menu" role="menu">
<li>
<a href="pre-registro.html">Pré-registro</a>
</li>
<li>
<a href="revisao-codigo.html">Revisão de código</a>
</li>
</ul>
</li>
</ul>
<ul class="nav navbar-nav navbar-right">
</ul>
</div><!--/.nav-collapse -->
</div><!--/.container -->
</div><!--/.navbar -->
<div id="header">
<div class="btn-group pull-right float-right">
<button type="button" class="btn btn-default btn-xs btn-secondary btn-sm dropdown-toggle" data-toggle="dropdown" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><span>Code</span> <span class="caret"></span></button>
<ul class="dropdown-menu dropdown-menu-right" style="min-width: 50px;">
<li><a id="rmd-download-source" href="#">Download Rmd</a></li>
</ul>
</div>
<h1 class="title toc-ignore">Resolução de conflitos de versão</h1>
<h4 class="author">Gabriel Nakamura</h4>
<h4 class="date">2024-07-16</h4>
</div>
<script>
addClassKlippyTo("pre.r, pre.markdown");
addKlippy('left', 'top', 'auto', '1', 'Copy code', 'Copied!');
</script>
<div id="apresentação" class="section level1">
<h1>Apresentação</h1>
<p>Não há nada mais frustrante no mundo do versionamento que um push ou
um pull rejeitado. Mas ao incorporarmos as ferramentas de versionamento
em nossa rotina de trabalho será inevitável em algum momento não
esbarrar em alguma mensagem de rejeição de um push ou pull que, a
maioria das vezes, tem como principal razão a existência de conflitos em
versões de documentos. Portanto, nesta seção vamos entender o que são
conflitos de versionamento, quais suas principais causas e como podemos
resolvê-los.</p>
</div>
<div id="o-que-são-os-conflitos" class="section level1">
<h1>O que são os conflitos?</h1>
<p>Conflitos são, de maneira muito sucinta, duas (ou mais) versões de um
mesmo arquivo. Conflitos são comuns mesmo quando não estamos utilizando
ferramentas de versionamento. Por exemplo, quando tentamos “colar” um
documento em uma pasta com um arquivo que já apresenta o mesmo nome.
Neste momento temos que tomar decisões: Manter o arquivo antigo?
Substituir o arquivo antigo pelo novo arquivo? Manter ambos os arquivos?
Essas são as mesmas decisões que devemos tomar quando lidamos com
conflitos de versões utilizando o git. Com a diferença que temos muito
mais controle de decisão do manejo dos conflitos nos arquivos sob
versionamento.</p>
<div id="quais-as-principais-causas" class="section level2">
<h2>Quais as principais causas?</h2>
<p>Os conflitos surgem por uma série de razões. Baseado no nosso uso
pessoal do versionamento, as duas razões mais comuns que geram versões
conflitantes são:</p>
<p>1 - Devido ao uso de arquivos em repositórios compartilhados, onde
duas ou mais pessoas criam versões diferentes de um mesmo arquivo em
comum.</p>
<p>2 - Devido ao uso de arquivos em diferentes máquinas. Mesmo que o
repositório seja de um único proprietário, caso esteja sendo utilizado
em mais de um computador, versões diferentes de um mesmo arquivo podem
ser criados.</p>
<p>Novamente, essas são as duas fontes mais comuns de conflitos que nós
nos deparamos na nossa prática diária, mas é importante lembrar que
outras fontes de conflito existem. O importante é saber identificar a
fonte de conflito e encotrar a melhor solução para sua resolução.
Veremos isso na próxima seção.</p>
</div>
</div>
<div id="como-identificar-conflitos" class="section level1">
<h1>Como identificar conflitos</h1>
<p>O conflito irá aparecer em seu console da seguinte maneira:</p>
<p>Quando gerados, os conflitos aparecem em nossos códigos da seguinte
maneira</p>
<p><img src="figs/conflicts-all.png" width="80%" style="display: block; margin: auto;" /></p>
<p>O arquivo com conflito vai ser indicado no seu console, ao abrir este
arquivo o local de conflito vai aparecer como indicado na figura
acima.</p>
<p>O que é importante entender: A região entre os caracteres
<<<<<< HEAD ======= indica a situação do seu arquivo
local. A região do código entre os caracteres =====
>>>>>>>>> [caracteres e números como indicado
na figura] indica a situação do arquivo no remoto.</p>
<p>A partir disso uma decisão deve ser tomada:</p>
<p>1 - manter um dos dois estados do repositório</p>
<p>2 - realizar um híbrido</p>
<p>3 - excluir ambas</p>
<p>Após tomada essa decisão os caracteres especiais devem ser removidos
do texto</p>
</div>
<div id="referências-para-resolução-de-conflitos"
class="section level1">
<h1>Referências para resolução de conflitos</h1>
<p>Aqui trago algumas das referências mais úteis para a resolução de
conflitos. Primeiro, um velho conhecido, o livro da Jenny Brian. O <a
href="https://happygitwithr.com/git-branches.html?q=confli#dealing-with-conflicts"><strong>capítulo
22</strong></a> é um apanhado muito interessante que apresenta
diferentes formas de resolução de conflitos, incluindo os prós e contras
de cada uma delas.</p>
<p>A segunda referência é o site <a href="https://ohshitgit.com/">“Oh
shit, Git!?!?”</a>. Este site não se trata de um conjunto didático, mas
sim um compilado de soluções práticas a problemas recorentes no mundo do
versionamento, incluindo problemas de conflitos.</p>
<p>A terceira referência é este material produzido por <a
href="https://www.freecodecamp.org/news/resolve-merge-conflicts-in-git-a-practical-guide/">Tapas
Adhikary</a>, que apresenta de maneira detalhada a origem dos conflitos
e como resolvê-los</p>
</div>
<div id="rmd-source-code">LS0tDQp0aXRsZTogJ1Jlc29sdcOnw6NvIGRlIGNvbmZsaXRvcyBkZSB2ZXJzw6NvJw0KYXV0aG9yOiAiR2FicmllbCBOYWthbXVyYSINCmRhdGU6ICJgciBTeXMuRGF0ZSgpYCINCm91dHB1dDogaHRtbF9kb2N1bWVudA0KLS0tDQoNCmBgYHtyIHNldHVwLCBpbmNsdWRlPUZBTFNFfQ0Ka25pdHI6Om9wdHNfY2h1bmskc2V0KGVjaG8gPSBUUlVFLCBmaWcuYWxpZ24gPSAiY2VudGVyIikNCmBgYA0KDQpgYGB7ciBrbGlwcHksIGVjaG89RkFMU0UsIGluY2x1ZGU9VFJVRX0NCmtsaXBweTo6a2xpcHB5KCkNCmBgYA0KDQojIEFwcmVzZW50YcOnw6NvDQoNCk7Do28gaMOhIG5hZGEgbWFpcyBmcnVzdHJhbnRlIG5vIG11bmRvIGRvIHZlcnNpb25hbWVudG8gcXVlIHVtIHB1c2ggb3UgdW0gcHVsbCByZWplaXRhZG8uIE1hcyBhbyBpbmNvcnBvcmFybW9zIGFzIGZlcnJhbWVudGFzIGRlIHZlcnNpb25hbWVudG8gZW0gbm9zc2Egcm90aW5hIGRlIHRyYWJhbGhvIHNlcsOhIGluZXZpdMOhdmVsIGVtIGFsZ3VtIG1vbWVudG8gbsOjbyBlc2JhcnJhciBlbSBhbGd1bWEgbWVuc2FnZW0gZGUgcmVqZWnDp8OjbyBkZSB1bSBwdXNoIG91IHB1bGwgcXVlLCBhIG1haW9yaWEgZGFzIHZlemVzLCB0ZW0gY29tbyBwcmluY2lwYWwgcmF6w6NvIGEgZXhpc3TDqm5jaWEgZGUgY29uZmxpdG9zIGVtIHZlcnPDtWVzIGRlIGRvY3VtZW50b3MuIFBvcnRhbnRvLCBuZXN0YSBzZcOnw6NvIHZhbW9zIGVudGVuZGVyIG8gcXVlIHPDo28gY29uZmxpdG9zIGRlIHZlcnNpb25hbWVudG8sIHF1YWlzIHN1YXMgcHJpbmNpcGFpcyBjYXVzYXMgZSBjb21vIHBvZGVtb3MgcmVzb2x2w6otbG9zLg0KDQojIE8gcXVlIHPDo28gb3MgY29uZmxpdG9zPw0KDQpDb25mbGl0b3Mgc8OjbywgZGUgbWFuZWlyYSBtdWl0byBzdWNpbnRhLCBkdWFzIChvdSBtYWlzKSB2ZXJzw7VlcyBkZSB1bSBtZXNtbyBhcnF1aXZvLiBDb25mbGl0b3Mgc8OjbyBjb211bnMgbWVzbW8gcXVhbmRvIG7Do28gZXN0YW1vcyB1dGlsaXphbmRvIGZlcnJhbWVudGFzIGRlIHZlcnNpb25hbWVudG8uIFBvciBleGVtcGxvLCBxdWFuZG8gdGVudGFtb3MgImNvbGFyIiB1bSBkb2N1bWVudG8gZW0gdW1hIHBhc3RhIGNvbSB1bSBhcnF1aXZvIHF1ZSBqw6EgYXByZXNlbnRhIG8gbWVzbW8gbm9tZS4gTmVzdGUgbW9tZW50byB0ZW1vcyBxdWUgdG9tYXIgZGVjaXPDtWVzOiBNYW50ZXIgbyBhcnF1aXZvIGFudGlnbz8gU3Vic3RpdHVpciBvIGFycXVpdm8gYW50aWdvIHBlbG8gbm92byBhcnF1aXZvPyBNYW50ZXIgYW1ib3Mgb3MgYXJxdWl2b3M/IA0KRXNzYXMgc8OjbyBhcyBtZXNtYXMgZGVjaXPDtWVzIHF1ZSBkZXZlbW9zIHRvbWFyIHF1YW5kbyBsaWRhbW9zIGNvbSBjb25mbGl0b3MgZGUgdmVyc8O1ZXMgdXRpbGl6YW5kbyBvIGdpdC4gQ29tIGEgZGlmZXJlbsOnYSBxdWUgdGVtb3MgbXVpdG8gbWFpcyBjb250cm9sZSBkZSBkZWNpc8OjbyBkbyBtYW5lam8gZG9zIGNvbmZsaXRvcyBub3MgYXJxdWl2b3Mgc29iIHZlcnNpb25hbWVudG8uDQoNCiMjIFF1YWlzIGFzIHByaW5jaXBhaXMgY2F1c2FzPw0KDQpPcyBjb25mbGl0b3Mgc3VyZ2VtIHBvciB1bWEgc8OpcmllIGRlIHJhesO1ZXMuIEJhc2VhZG8gbm8gbm9zc28gdXNvIHBlc3NvYWwgZG8gdmVyc2lvbmFtZW50bywgYXMgZHVhcyByYXrDtWVzIG1haXMgY29tdW5zIHF1ZSBnZXJhbSB2ZXJzw7VlcyBjb25mbGl0YW50ZXMgc8OjbzogDQoNCjEgLSBEZXZpZG8gYW8gdXNvIGRlIGFycXVpdm9zIGVtIHJlcG9zaXTDs3Jpb3MgY29tcGFydGlsaGFkb3MsIG9uZGUgZHVhcyBvdSBtYWlzIHBlc3NvYXMgY3JpYW0gdmVyc8O1ZXMgZGlmZXJlbnRlcyBkZSB1bSBtZXNtbyBhcnF1aXZvIGVtIGNvbXVtLiANCg0KMiAtIERldmlkbyBhbyB1c28gZGUgYXJxdWl2b3MgZW0gZGlmZXJlbnRlcyBtw6FxdWluYXMuIE1lc21vIHF1ZSBvIHJlcG9zaXTDs3JpbyBzZWphIGRlIHVtIMO6bmljbyBwcm9wcmlldMOhcmlvLCBjYXNvIGVzdGVqYSBzZW5kbyB1dGlsaXphZG8gZW0gbWFpcyBkZSB1bSBjb21wdXRhZG9yLCB2ZXJzw7VlcyBkaWZlcmVudGVzIGRlIHVtIG1lc21vIGFycXVpdm8gcG9kZW0gc2VyIGNyaWFkb3MuDQoNCk5vdmFtZW50ZSwgZXNzYXMgc8OjbyBhcyBkdWFzIGZvbnRlcyBtYWlzIGNvbXVucyBkZSBjb25mbGl0b3MgcXVlIG7Ds3Mgbm9zIGRlcGFyYW1vcyBuYSBub3NzYSBwcsOhdGljYSBkacOhcmlhLCBtYXMgw6kgaW1wb3J0YW50ZSBsZW1icmFyIHF1ZSBvdXRyYXMgZm9udGVzIGRlIGNvbmZsaXRvIGV4aXN0ZW0uIE8gaW1wb3J0YW50ZSDDqSBzYWJlciBpZGVudGlmaWNhciBhIGZvbnRlIGRlIGNvbmZsaXRvIGUgZW5jb3RyYXIgYSBtZWxob3Igc29sdcOnw6NvIHBhcmEgc3VhIHJlc29sdcOnw6NvLiBWZXJlbW9zIGlzc28gbmEgcHLDs3hpbWEgc2XDp8Ojby4NCg0KDQojIENvbW8gaWRlbnRpZmljYXIgY29uZmxpdG9zDQoNCk8gY29uZmxpdG8gaXLDoSBhcGFyZWNlciBlbSBzZXUgY29uc29sZSBkYSBzZWd1aW50ZSBtYW5laXJhOg0KDQpRdWFuZG8gZ2VyYWRvcywgb3MgY29uZmxpdG9zIGFwYXJlY2VtIGVtIG5vc3NvcyBjw7NkaWdvcyBkYSBzZWd1aW50ZSBtYW5laXJhDQoNCmBgYHtyIGVjaG89RkFMU0UsIGV2YWw9VFJVRSxvdXQud2lkdGg9IjgwJSJ9DQprbml0cjo6aW5jbHVkZV9ncmFwaGljcyhoZXJlOjpoZXJlKCJmaWdzIiwgImNvbmZsaWN0cy1hbGwucG5nIikpDQpgYGANCg0KTyBhcnF1aXZvIGNvbSBjb25mbGl0byB2YWkgc2VyIGluZGljYWRvIG5vIHNldSBjb25zb2xlLCBhbyBhYnJpciBlc3RlIGFycXVpdm8gbyBsb2NhbCBkZSBjb25mbGl0byB2YWkgYXBhcmVjZXIgY29tbyBpbmRpY2FkbyBuYSBmaWd1cmEgYWNpbWEuIA0KDQpPIHF1ZSDDqSBpbXBvcnRhbnRlIGVudGVuZGVyOiBBIHJlZ2nDo28gZW50cmUgb3MgY2FyYWN0ZXJlcyA8PDw8PDwgSEVBRCA9PT09PT09IGluZGljYSBhIHNpdHVhw6fDo28gZG8gc2V1IGFycXVpdm8gbG9jYWwuIEEgcmVnacOjbyBkbyBjw7NkaWdvIGVudHJlIG9zIGNhcmFjdGVyZXMgPT09PT0gPj4+Pj4+Pj4+IFtjYXJhY3RlcmVzIGUgbsO6bWVyb3MgY29tbyBpbmRpY2FkbyBuYSBmaWd1cmFdIGluZGljYSBhIHNpdHVhw6fDo28gZG8gYXJxdWl2byBubyByZW1vdG8uDQoNCkEgcGFydGlyIGRpc3NvIHVtYSBkZWNpc8OjbyBkZXZlIHNlciB0b21hZGE6DQoNCjEgLSBtYW50ZXIgdW0gZG9zIGRvaXMgZXN0YWRvcyBkbyByZXBvc2l0w7NyaW8NCg0KMiAtIHJlYWxpemFyIHVtIGjDrWJyaWRvIA0KDQozIC0gZXhjbHVpciBhbWJhcw0KDQpBcMOzcyB0b21hZGEgZXNzYSBkZWNpc8OjbyBvcyBjYXJhY3RlcmVzIGVzcGVjaWFpcyBkZXZlbSBzZXIgcmVtb3ZpZG9zIGRvIHRleHRvDQoNCiMgUmVmZXLDqm5jaWFzIHBhcmEgcmVzb2x1w6fDo28gZGUgY29uZmxpdG9zDQoNCkFxdWkgdHJhZ28gYWxndW1hcyBkYXMgcmVmZXLDqm5jaWFzIG1haXMgw7p0ZWlzIHBhcmEgYSByZXNvbHXDp8OjbyBkZSBjb25mbGl0b3MuIA0KUHJpbWVpcm8sIHVtIHZlbGhvIGNvbmhlY2lkbywgbyBsaXZybyBkYSBKZW5ueSBCcmlhbi4gTyBbKipjYXDDrXR1bG8gMjIqKl0oaHR0cHM6Ly9oYXBweWdpdHdpdGhyLmNvbS9naXQtYnJhbmNoZXMuaHRtbD9xPWNvbmZsaSNkZWFsaW5nLXdpdGgtY29uZmxpY3RzKSDDqSB1bSBhcGFuaGFkbyBtdWl0byBpbnRlcmVzc2FudGUgcXVlIGFwcmVzZW50YSBkaWZlcmVudGVzIGZvcm1hcyBkZSByZXNvbHXDp8OjbyBkZSBjb25mbGl0b3MsIGluY2x1aW5kbyBvcyBwcsOzcyBlIGNvbnRyYXMgZGUgY2FkYSB1bWEgZGVsYXMuDQoNCkEgc2VndW5kYSByZWZlcsOqbmNpYSDDqSBvIHNpdGUgWyJPaCBzaGl0LCBHaXQhPyE/Il0oaHR0cHM6Ly9vaHNoaXRnaXQuY29tLykuIEVzdGUgc2l0ZSBuw6NvIHNlIHRyYXRhIGRlIHVtIGNvbmp1bnRvIGRpZMOhdGljbywgbWFzIHNpbSB1bSBjb21waWxhZG8gZGUgc29sdcOnw7VlcyBwcsOhdGljYXMgYSBwcm9ibGVtYXMgcmVjb3JlbnRlcyBubyBtdW5kbyBkbyB2ZXJzaW9uYW1lbnRvLCBpbmNsdWluZG8gcHJvYmxlbWFzIGRlIGNvbmZsaXRvcy4NCg0KQSB0ZXJjZWlyYSByZWZlcsOqbmNpYSDDqSBlc3RlIG1hdGVyaWFsIHByb2R1emlkbyBwb3IgW1RhcGFzIEFkaGlrYXJ5XShodHRwczovL3d3dy5mcmVlY29kZWNhbXAub3JnL25ld3MvcmVzb2x2ZS1tZXJnZS1jb25mbGljdHMtaW4tZ2l0LWEtcHJhY3RpY2FsLWd1aWRlLyksIHF1ZSBhcHJlc2VudGEgZGUgbWFuZWlyYSBkZXRhbGhhZGEgYSBvcmlnZW0gZG9zIGNvbmZsaXRvcyBlIGNvbW8gcmVzb2x2w6otbG9zDQo=</div>
</div>
</div>
</div>
<script>
// add bootstrap table styles to pandoc tables
function bootstrapStylePandocTables() {
$('tr.odd').parent('tbody').parent('table').addClass('table table-condensed');
}
$(document).ready(function () {
bootstrapStylePandocTables();
});
</script>
<!-- tabsets -->
<script>
$(document).ready(function () {
window.buildTabsets("TOC");
});
$(document).ready(function () {
$('.tabset-dropdown > .nav-tabs > li').click(function () {
$(this).parent().toggleClass('nav-tabs-open');
});
});
</script>
<!-- code folding -->
<script>
$(document).ready(function () {
window.initializeSourceEmbed("conflitos.Rmd");
});
</script>
<script>
$(document).ready(function () {
// temporarily add toc-ignore selector to headers for the consistency with Pandoc
$('.unlisted.unnumbered').addClass('toc-ignore')
// move toc-ignore selectors from section div to header
$('div.section.toc-ignore')
.removeClass('toc-ignore')
.children('h1,h2,h3,h4,h5').addClass('toc-ignore');
// establish options
var options = {
selectors: "h1,h2,h3",
theme: "bootstrap3",
context: '.toc-content',
hashGenerator: function (text) {
return text.replace(/[.\\/?&!#<>]/g, '').replace(/\s/g, '_');
},
ignoreSelector: ".toc-ignore",
scrollTo: 0
};
options.showAndHide = true;
options.smoothScroll = true;
// tocify
var toc = $("#TOC").tocify(options).data("toc-tocify");
});
</script>
<!-- dynamically load mathjax for compatibility with self-contained -->
<script>
(function () {
var script = document.createElement("script");
script.type = "text/javascript";
script.src = "https://mathjax.rstudio.com/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML";
document.getElementsByTagName("head")[0].appendChild(script);
})();
</script>
</body>
</html>