Merge Conflict

// Definition

A state Git enters when two branches modify the same part of a file in incompatible ways and cannot be automatically combined. Git marks the conflict with `<<<<<<<`, `=======`, and `>>>>>>>` markers and waits for a developer to choose which version (or a manual combination) should survive. Merge conflicts are most common on long-lived feature branches or when several people edit the same test file simultaneously.

// Related terms

• Build

  The process of compiling source code and packaging it into a runnable artifact. Also refers to the resulting artifact and a numbered identifier for that specific output.

• Continuous Integration

  The practice of merging code changes to a shared branch frequently, with automated builds and tests running on every change. Catches integration issues early and keeps the main branch always shippable.