Sobre conflitos de merge→
Os conflitos de merge acontecem quando você faz merge de branches que têm commits concorrentes e o Git precisa da sua ajuda para decidir quais alterações incorporar n merge final.
Resolving a merge conflict on GitHub→
You can resolve simple merge conflicts that involve competing line changes on GitHub, using the conflict editor.
Resolver um conflito de merge usando a linha de comando→
Você pode resolver conflitos de merge usando a linha de comando e um editor de texto.

Formed in 2009, the Archive Team (not to be confused with the archive.org Archive-It Team) is a rogue archivist collective dedicated to saving copies of rapidly dying or deleted websites for the sake of history and digital heritage. The group is 100% composed of volunteers and interested parties, and has expanded into a large amount of related projects for saving online and digital history.
