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/3e876ce8afe8c9047e8fa1534f0f522eac3b3dd4/lib/src/conflict-helper.ts#L31)
15
+
Defined in: [conflict-helper.ts:31](https://github.com/react18-tools/git-json-resolver/blob/a2478ece98639631a4ef55ad595d0d4ff30f30d2/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:24](https://github.com/react18-tools/git-json-resolver/blob/3e876ce8afe8c9047e8fa1534f0f522eac3b3dd4/lib/src/file-parser.ts#L24)
13
+
Defined in: [file-parser.ts:24](https://github.com/react18-tools/git-json-resolver/blob/a2478ece98639631a4ef55ad595d0d4ff30f30d2/lib/src/file-parser.ts#L24)
14
14
15
15
Options for parsing conflicted content.
16
16
@@ -20,7 +20,7 @@ Options for parsing conflicted content.
20
20
21
21
> `optional`**filename**: `string`
22
22
23
-
Defined in: [file-parser.ts:42](https://github.com/react18-tools/git-json-resolver/blob/3e876ce8afe8c9047e8fa1534f0f522eac3b3dd4/lib/src/file-parser.ts#L42)
23
+
Defined in: [file-parser.ts:42](https://github.com/react18-tools/git-json-resolver/blob/a2478ece98639631a4ef55ad595d0d4ff30f30d2/lib/src/file-parser.ts#L42)
24
24
25
25
Optional filename hint to prioritize parser choice.
26
26
Example:
@@ -34,7 +34,7 @@ If extension is unknown, falls back to `parsers` or `"json"`.
Defined in: [file-parser.ts:32](https://github.com/react18-tools/git-json-resolver/blob/3e876ce8afe8c9047e8fa1534f0f522eac3b3dd4/lib/src/file-parser.ts#L32)
37
+
Defined in: [file-parser.ts:32](https://github.com/react18-tools/git-json-resolver/blob/a2478ece98639631a4ef55ad595d0d4ff30f30d2/lib/src/file-parser.ts#L32)
38
38
39
39
Parsers to attempt, in order:
40
40
@@ -47,7 +47,7 @@ Defaults to `"json"`.
47
47
48
48
### ParsedConflict\<T\>
49
49
50
-
Defined in: [file-parser.ts:6](https://github.com/react18-tools/git-json-resolver/blob/3e876ce8afe8c9047e8fa1534f0f522eac3b3dd4/lib/src/file-parser.ts#L6)
50
+
Defined in: [file-parser.ts:6](https://github.com/react18-tools/git-json-resolver/blob/a2478ece98639631a4ef55ad595d0d4ff30f30d2/lib/src/file-parser.ts#L6)
51
51
52
52
Represents a parsed conflict from a file with `ours` and `theirs` versions.
53
53
@@ -65,23 +65,23 @@ The type of the parsed content.
65
65
66
66
> **format**: `string`
67
67
68
-
Defined in: [file-parser.ts:12](https://github.com/react18-tools/git-json-resolver/blob/3e876ce8afe8c9047e8fa1534f0f522eac3b3dd4/lib/src/file-parser.ts#L12)
68
+
Defined in: [file-parser.ts:12](https://github.com/react18-tools/git-json-resolver/blob/a2478ece98639631a4ef55ad595d0d4ff30f30d2/lib/src/file-parser.ts#L12)
69
69
70
70
Format used to parse the content (`json`, `yaml`, `toml`, `xml`, or `custom`).
71
71
72
72
##### ours
73
73
74
74
> **ours**: `T`
75
75
76
-
Defined in: [file-parser.ts:8](https://github.com/react18-tools/git-json-resolver/blob/3e876ce8afe8c9047e8fa1534f0f522eac3b3dd4/lib/src/file-parser.ts#L8)
76
+
Defined in: [file-parser.ts:8](https://github.com/react18-tools/git-json-resolver/blob/a2478ece98639631a4ef55ad595d0d4ff30f30d2/lib/src/file-parser.ts#L8)
77
77
78
78
Parsed content from the "ours" side of the conflict.
79
79
80
80
##### theirs
81
81
82
82
> **theirs**: `T`
83
83
84
-
Defined in: [file-parser.ts:10](https://github.com/react18-tools/git-json-resolver/blob/3e876ce8afe8c9047e8fa1534f0f522eac3b3dd4/lib/src/file-parser.ts#L10)
84
+
Defined in: [file-parser.ts:10](https://github.com/react18-tools/git-json-resolver/blob/a2478ece98639631a4ef55ad595d0d4ff30f30d2/lib/src/file-parser.ts#L10)
85
85
86
86
Parsed content from the "theirs" side of the conflict.
87
87
@@ -91,7 +91,7 @@ Parsed content from the "theirs" side of the conflict.
Defined in: [file-parser.ts:16](https://github.com/react18-tools/git-json-resolver/blob/3e876ce8afe8c9047e8fa1534f0f522eac3b3dd4/lib/src/file-parser.ts#L16)
94
+
Defined in: [file-parser.ts:16](https://github.com/react18-tools/git-json-resolver/blob/a2478ece98639631a4ef55ad595d0d4ff30f30d2/lib/src/file-parser.ts#L16)
95
95
96
96
A parser function that takes a raw string and returns parsed content.
97
97
@@ -101,13 +101,13 @@ A parser function that takes a raw string and returns parsed content.
101
101
102
102
> **name**: `string`
103
103
104
-
Defined in: [file-parser.ts:16](https://github.com/react18-tools/git-json-resolver/blob/3e876ce8afe8c9047e8fa1534f0f522eac3b3dd4/lib/src/file-parser.ts#L16)
104
+
Defined in: [file-parser.ts:16](https://github.com/react18-tools/git-json-resolver/blob/a2478ece98639631a4ef55ad595d0d4ff30f30d2/lib/src/file-parser.ts#L16)
105
105
106
106
##### parser()
107
107
108
108
> **parser**: (`input`: `string`) => `unknown`
109
109
110
-
Defined in: [file-parser.ts:16](https://github.com/react18-tools/git-json-resolver/blob/3e876ce8afe8c9047e8fa1534f0f522eac3b3dd4/lib/src/file-parser.ts#L16)
110
+
Defined in: [file-parser.ts:16](https://github.com/react18-tools/git-json-resolver/blob/a2478ece98639631a4ef55ad595d0d4ff30f30d2/lib/src/file-parser.ts#L16)
111
111
112
112
###### Parameters
113
113
@@ -125,7 +125,7 @@ Defined in: [file-parser.ts:16](https://github.com/react18-tools/git-json-resolv
Defined in: [file-parser.ts:19](https://github.com/react18-tools/git-json-resolver/blob/3e876ce8afe8c9047e8fa1534f0f522eac3b3dd4/lib/src/file-parser.ts#L19)
128
+
Defined in: [file-parser.ts:19](https://github.com/react18-tools/git-json-resolver/blob/a2478ece98639631a4ef55ad595d0d4ff30f30d2/lib/src/file-parser.ts#L19)
129
129
130
130
Built-in parser identifiers or a custom parser function.
131
131
@@ -135,7 +135,7 @@ Built-in parser identifiers or a custom parser function.
Defined in: [file-parser.ts:62](https://github.com/react18-tools/git-json-resolver/blob/3e876ce8afe8c9047e8fa1534f0f522eac3b3dd4/lib/src/file-parser.ts#L62)
138
+
Defined in: [file-parser.ts:62](https://github.com/react18-tools/git-json-resolver/blob/a2478ece98639631a4ef55ad595d0d4ff30f30d2/lib/src/file-parser.ts#L62)
139
139
140
140
Parses a conflicted file's content into separate `ours` and `theirs` objects.
Defined in: [file-serializer.ts:1](https://github.com/react18-tools/git-json-resolver/blob/3e876ce8afe8c9047e8fa1534f0f522eac3b3dd4/lib/src/file-serializer.ts#L1)
15
+
Defined in: [file-serializer.ts:1](https://github.com/react18-tools/git-json-resolver/blob/a2478ece98639631a4ef55ad595d0d4ff30f30d2/lib/src/file-serializer.ts#L1)
0 commit comments