You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Defined in: [conflict-helper.ts:31](https://github.com/react18-tools/git-json-resolver/blob/39336b33e116055265cb78e2e7ef769cc52bdba1/lib/src/conflict-helper.ts#L31)
15
+
Defined in: [conflict-helper.ts:31](https://github.com/react18-tools/git-json-resolver/blob/6e75e49557f9b5e6210062de3c8a81741a79c347/lib/src/conflict-helper.ts#L31)
Copy file name to clipboardExpand all lines: docs/file-parser.md
+12-12Lines changed: 12 additions & 12 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -10,7 +10,7 @@ nav_order: 6
10
10
11
11
### ParseConflictOptions
12
12
13
-
Defined in: [file-parser.ts:26](https://github.com/react18-tools/git-json-resolver/blob/39336b33e116055265cb78e2e7ef769cc52bdba1/lib/src/file-parser.ts#L26)
13
+
Defined in: [file-parser.ts:26](https://github.com/react18-tools/git-json-resolver/blob/6e75e49557f9b5e6210062de3c8a81741a79c347/lib/src/file-parser.ts#L26)
14
14
15
15
Options for parsing conflicted content.
16
16
@@ -24,7 +24,7 @@ Options for parsing conflicted content.
24
24
25
25
> **filename**: `string`
26
26
27
-
Defined in: [file-parser.ts:35](https://github.com/react18-tools/git-json-resolver/blob/39336b33e116055265cb78e2e7ef769cc52bdba1/lib/src/file-parser.ts#L35)
27
+
Defined in: [file-parser.ts:35](https://github.com/react18-tools/git-json-resolver/blob/6e75e49557f9b5e6210062de3c8a81741a79c347/lib/src/file-parser.ts#L35)
28
28
29
29
filename hint to prioritize parser choice as well as get base and ours from git.
30
30
Example:
@@ -38,7 +38,7 @@ If extension is unknown, falls back to `parsers` or `"json"`.
Defined in: [types.ts:245](https://github.com/react18-tools/git-json-resolver/blob/39336b33e116055265cb78e2e7ef769cc52bdba1/lib/src/types.ts#L245)
41
+
Defined in: [types.ts:245](https://github.com/react18-tools/git-json-resolver/blob/6e75e49557f9b5e6210062de3c8a81741a79c347/lib/src/types.ts#L245)
42
42
43
43
Parsers to attempt, in order:
44
44
@@ -55,7 +55,7 @@ Defaults to `"json"`.
55
55
56
56
### ParsedConflict\<T\>
57
57
58
-
Defined in: [file-parser.ts:12](https://github.com/react18-tools/git-json-resolver/blob/39336b33e116055265cb78e2e7ef769cc52bdba1/lib/src/file-parser.ts#L12)
58
+
Defined in: [file-parser.ts:12](https://github.com/react18-tools/git-json-resolver/blob/6e75e49557f9b5e6210062de3c8a81741a79c347/lib/src/file-parser.ts#L12)
59
59
60
60
Represents a parsed conflict from a file with `ours` and `theirs` versions.
61
61
@@ -73,31 +73,31 @@ The type of the parsed content.
73
73
74
74
> `optional`**base**: `T`
75
75
76
-
Defined in: [file-parser.ts:18](https://github.com/react18-tools/git-json-resolver/blob/39336b33e116055265cb78e2e7ef769cc52bdba1/lib/src/file-parser.ts#L18)
76
+
Defined in: [file-parser.ts:18](https://github.com/react18-tools/git-json-resolver/blob/6e75e49557f9b5e6210062de3c8a81741a79c347/lib/src/file-parser.ts#L18)
77
77
78
78
Parsed content from the "base" side of the conflict (optional).
79
79
80
80
##### format
81
81
82
82
> **format**: `string`
83
83
84
-
Defined in: [file-parser.ts:20](https://github.com/react18-tools/git-json-resolver/blob/39336b33e116055265cb78e2e7ef769cc52bdba1/lib/src/file-parser.ts#L20)
84
+
Defined in: [file-parser.ts:20](https://github.com/react18-tools/git-json-resolver/blob/6e75e49557f9b5e6210062de3c8a81741a79c347/lib/src/file-parser.ts#L20)
85
85
86
86
Format used to parse the content (`json`, `yaml`, `toml`, `xml`, or `custom`).
87
87
88
88
##### ours
89
89
90
90
> **ours**: `T`
91
91
92
-
Defined in: [file-parser.ts:14](https://github.com/react18-tools/git-json-resolver/blob/39336b33e116055265cb78e2e7ef769cc52bdba1/lib/src/file-parser.ts#L14)
92
+
Defined in: [file-parser.ts:14](https://github.com/react18-tools/git-json-resolver/blob/6e75e49557f9b5e6210062de3c8a81741a79c347/lib/src/file-parser.ts#L14)
93
93
94
94
Parsed content from the "ours" side of the conflict.
95
95
96
96
##### theirs
97
97
98
98
> **theirs**: `T`
99
99
100
-
Defined in: [file-parser.ts:16](https://github.com/react18-tools/git-json-resolver/blob/39336b33e116055265cb78e2e7ef769cc52bdba1/lib/src/file-parser.ts#L16)
100
+
Defined in: [file-parser.ts:16](https://github.com/react18-tools/git-json-resolver/blob/6e75e49557f9b5e6210062de3c8a81741a79c347/lib/src/file-parser.ts#L16)
101
101
102
102
Parsed content from the "theirs" side of the conflict.
103
103
@@ -107,7 +107,7 @@ Parsed content from the "theirs" side of the conflict.
Defined in: [file-parser.ts:144](https://github.com/react18-tools/git-json-resolver/blob/39336b33e116055265cb78e2e7ef769cc52bdba1/lib/src/file-parser.ts#L144)
110
+
Defined in: [file-parser.ts:144](https://github.com/react18-tools/git-json-resolver/blob/6e75e49557f9b5e6210062de3c8a81741a79c347/lib/src/file-parser.ts#L144)
111
111
112
112
Normalize parsers based on filename + options.
113
113
@@ -127,7 +127,7 @@ Normalize parsers based on filename + options.
Defined in: [file-parser.ts:55](https://github.com/react18-tools/git-json-resolver/blob/39336b33e116055265cb78e2e7ef769cc52bdba1/lib/src/file-parser.ts#L55)
130
+
Defined in: [file-parser.ts:55](https://github.com/react18-tools/git-json-resolver/blob/6e75e49557f9b5e6210062de3c8a81741a79c347/lib/src/file-parser.ts#L55)
131
131
132
132
Parses a conflicted file's content into separate `ours` and `theirs` objects.
133
133
@@ -177,7 +177,7 @@ If parsing fails or conflict markers are invalid.
Defined in: [file-parser.ts:183](https://github.com/react18-tools/git-json-resolver/blob/39336b33e116055265cb78e2e7ef769cc52bdba1/lib/src/file-parser.ts#L183)
180
+
Defined in: [file-parser.ts:183](https://github.com/react18-tools/git-json-resolver/blob/6e75e49557f9b5e6210062de3c8a81741a79c347/lib/src/file-parser.ts#L183)
181
181
182
182
Internal parser dispatcher for supported formats.
183
183
@@ -201,7 +201,7 @@ Internal parser dispatcher for supported formats.
Defined in: [file-parser.ts:165](https://github.com/react18-tools/git-json-resolver/blob/39336b33e116055265cb78e2e7ef769cc52bdba1/lib/src/file-parser.ts#L165)
204
+
Defined in: [file-parser.ts:165](https://github.com/react18-tools/git-json-resolver/blob/6e75e49557f9b5e6210062de3c8a81741a79c347/lib/src/file-parser.ts#L165)
Defined in: [file-serializer.ts:1](https://github.com/react18-tools/git-json-resolver/blob/39336b33e116055265cb78e2e7ef769cc52bdba1/lib/src/file-serializer.ts#L1)
15
+
Defined in: [file-serializer.ts:1](https://github.com/react18-tools/git-json-resolver/blob/6e75e49557f9b5e6210062de3c8a81741a79c347/lib/src/file-serializer.ts#L1)
Defined in: [merge-processor.ts:17](https://github.com/react18-tools/git-json-resolver/blob/39336b33e116055265cb78e2e7ef769cc52bdba1/lib/src/merge-processor.ts#L17)
15
+
Defined in: [merge-processor.ts:17](https://github.com/react18-tools/git-json-resolver/blob/6e75e49557f9b5e6210062de3c8a81741a79c347/lib/src/merge-processor.ts#L17)
16
16
17
17
Common merge logic for processing a single file with ours/theirs/base data
18
18
@@ -92,7 +92,7 @@ Common merge logic for processing a single file with ours/theirs/base data
Defined in: [merge-processor.ts:92](https://github.com/react18-tools/git-json-resolver/blob/39336b33e116055265cb78e2e7ef769cc52bdba1/lib/src/merge-processor.ts#L92)
95
+
Defined in: [merge-processor.ts:92](https://github.com/react18-tools/git-json-resolver/blob/6e75e49557f9b5e6210062de3c8a81741a79c347/lib/src/merge-processor.ts#L92)
96
96
97
97
Resolves Git merge conflicts for a single file using the three-way merge approach.
98
98
This function is designed to work as a Git merge driver.
0 commit comments