git-json-merge

git-json-merge copied to clipboard

Parse as JSON5

2

Hello :wave: I know this isn't `git-json5-merge`, but I had to make this change to make it work on my machine, and I thought there's no harm in sending a...

hasparus

fix json parse for empty base file

1

If base file is empty there is an error trying to parse empty string as json. This PR adds check: if base file is '' then use empty `{}` object.

maestrow

Right now merge conflicts on JSON with comments crash. Comments in JSON files appear quite often nowadays (for example `tsconfig.json`)

hasparus

Add: Failing test case.

8

Your tools came in pretty handy in some of my recent projects. However I did not realise, but when dealing with arrays, it could lead to data loss. How do...

cadesalaberry

jonatanpedersen

When using the merge driver, i get the following error: ``` > git merge temp $(npm bin)/git-json-merge .merge_file_tpeMkq .merge_file_XDZbj1 .merge_file_gwQud5: Unknown: command not found Auto-merging document.json CONFLICT (content): Merge conflict...

ch1ll0ut1

Preserve trailing newlines

1

Preserve trailing newlines if they are present in the original JSON (and merge the newline-presence if different). Fixes #19.

koterpillar

No trailing newline

2

After merging, the resulting JSON file doesn't have a trailing newline, even if the original files did. Most files tend to have the trailing newlines, so it would be a...

koterpillar

I'm using `git-json-merge` to merge `package.json` files where dependencies are typically sorted alphabetically. It would be useful to have the merge preserve the relative order of items where possible, i.e.:...

koterpillar