About merge conflicts→
Merge conflicts happen when you merge branches that have competing commits, and Git needs your help to decide which changes to incorporate in the final merge.
Resolving a merge conflict on GitHub→
You can resolve simple merge conflicts that involve competing line changes on GitHub, using the conflict editor.
Resolving a merge conflict using the command line→
You can resolve merge conflicts using the command line and a text editor.

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.
