1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
exit Some(0)
{
"file": "app.py",
"clean": false,
"conflicts": [
{
"entity": "a",
"entity_type": "function",
"kind": "both_modified",
"refused_by": "statement_fold",
"complexity": "F",
"contested_hunks": 1,
"hunks": [
{
"base_start": 2,
"base_end": 2,
"ours": {
"action": "modified",
"removed_lines": 1,
"added_lines": 1,
"added": [
" return 10"
]
},
"theirs": {
"action": "modified",
"removed_lines": 1,
"added_lines": 1,
"added": [
" return 11"
]
},
"collision": [
" return 1"
]
}
]
}
]
}