A Git conflict happens when Git has no idea whether the remote version or the local version is the correct version.

You'll learn how to resolve a Git conflict today.