Is the definition of a conflict in git correct?

Question

git

Good day to all!
I know what a conflict is, but I want to be more precise with the term "Conflict in git".
In my opinion, in a simple way the definition of a conflict is:
"A conflict is a state of a file in which, when branches are merged, changes in these branches were made on the same line."
What definition would you give?

Answer 1

A formal (potential) conflict in Git in the context of merging branches is a situation that occurs when creating a merge commit when the same file (one or more) has a different state in the snapshots of the merged branches. Such conflicts can be classified into automatically resolved and not automatically resolved.
An auto-resolved conflict is a formal conflict in which Git can independently generate a snapshot for a merge commit by applying a merge algorithm (such as a three-way merge ) according to a chosen merge strategy to each of the conflicting files.
Conflict not resolved automatically- a formal conflict in which Git cannot itself generate a snapshot for a merge commit. Usually it is these automatically unresolved conflicts that are simply called conflicts . In this case, the formation of a snapshot requires manual intervention (which is called "conflict resolution" in the everyday sense).

Answer 2

why invent something when it is described in the documentation?
https://git-scm.com/book/en/v2/Branching-in-Git-Basic...
section "Basic Merge Conflicts"