Please enable JavaScript to use CodeHS

CodeHS Glossary


Merge Conflict General

A situation where Git cannot merge automatically because two branches changed the same part of a file differently. A person must choose what to keep.