Skip to content

Commit 5bfe810

Browse files
committed
docs(changeset): Add \n at end to keep the formatters and linters happy!
1 parent 9e22aa8 commit 5bfe810

File tree

3 files changed

+7
-3
lines changed

3 files changed

+7
-3
lines changed

.changeset/eighty-peaches-grab.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"git-json-resolver": patch
3+
---
4+
5+
Add \n at end to keep the formatters and linters happy!

README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
![Git JSON Resolver Banner](./banner.jpg)
44

55
[![test](https://github.com/react18-tools/git-json-resolver/actions/workflows/test.yml/badge.svg)](https://github.com/react18-tools/git-json-resolver/actions/workflows/test.yml)
6-
[![Maintainability](https://qlty.sh/gh/react18-tools/projects/git-json-resolver/maintainability.svg)](https://qlty.sh/gh/react18-tools/projects/git-json-resolver)
76
[![codecov](https://codecov.io/gh/react18-tools/git-json-resolver/graph/badge.svg)](https://codecov.io/gh/react18-tools/git-json-resolver)
87
[![Version](https://img.shields.io/npm/v/git-json-resolver.svg?colorB=green)](https://www.npmjs.com/package/git-json-resolver)
98
[![Downloads](https://img.jsdelivr.com/img.shields.io/npm/d18m/git-json-resolver.svg)](https://www.npmjs.com/package/git-json-resolver)

lib/src/merge-processor.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,9 @@ export const processMerge = async <T extends string = InbuiltMergeStrategies>({
7070
} else {
7171
const serialized = await reconstructConflict(merged, ours, theirs, format);
7272
await Promise.all([
73-
fs.writeFile(filePath, serialized, "utf8"),
73+
fs.writeFile(filePath, `${serialized}\n`, "utf8"),
7474
config.writeConflictSidecar
75-
? fs.writeFile(`${filePath}.conflict.json`, JSON.stringify(conflicts, null, 2))
75+
? fs.writeFile(`${filePath}.conflict.json`, `${JSON.stringify(conflicts, null, 2)}\n`)
7676
: null,
7777
]);
7878
return { success: false, conflicts };

0 commit comments

Comments
 (0)