SóProvas


ID
3226204
Banca
INSTITUTO AOCP
Órgão
PRODEB
Ano
2018
Provas
Disciplina
Inglês
Assuntos

Considere o seguinte texto para responder a questão.

Advanced Merging in GIT

    Merging in Git is typically fairly easy. Since Git makes it easy to merge another branch multiple times, it means that you can have a very long lived branch but you can keep it up to date as you go, solving small conflicts often, rather than being surprised by one enormous conflict at the end of the series. 

     However, sometimes tricky conflicts do occur. Unlike some other version control systems, Git does not try to be overly clever about merge conflict resolution. Git’s philosophy is to be smart about determining when a merge resolution is unambiguous, but if there is a conflict, it does not try to be clever about automatically resolving it. Therefore, if you wait too long to merge two branches that diverge quickly, you can run into some issues.

Scott Chacon and Ben Straub - Pro GIT – Everything you need to
know about GIT. Apress, 2018 -Page 267.

The first word of the second paragraph is grammatically defined as a conjunction, which is also known as:

Alternativas
Comentários
  • c-

    linking words join different clauses in a sentence so as to make the relationship between ideas possible