ConflictSection
A run of one conflicted file: lines both sides agree on, or a block where they differ.
Every line keeps its terminator, so joining a resolution's lines reproduces the file's line endings and its final newline exactly.
Shape
object or object
Example
Synthesized example{
"lines": [
"lines-927e",
"lines-a0b0"
],
"type": "common"
}
Graph
Used inside
Contains
No named schema inside.
Used by
Sent by 0 operations
No operation takes it as a request body.
Returned by 0 operations
No operation returns it directly.