Merge conflicts in JSON files because of trailing comma

[pastk]

Describe the issue

I have merge conflicts in JSON files like this:

<<<<<<< HEAD
"Belarus_Hrodna Region":"Gardino sritis"
=======
"Belarus_Hrodna Region":"Gardino sritis",
"Belarus_Maglieu Region":"Mogiliavo sritis",
"Belarus_Brest Region":"Bresto sritis",
>>>>>>> 5d970825 ([strings] Update from Codeberg Translate)
}

They seem to happen when new strings are added to the end of the file and a trailing comma has to be added to the previous last line which is otherwise unchanged.

I have a "Customize JSON output" add-on activated.

I already tried

• I've read and searched the documentation.
• I've searched for similar filed issues in this repository.

Steps to reproduce the behavior

As above.

Add new strings to the JSON file.

Expected behavior

No merge conflict.

Perhaps it won't be easy to make Weblate merge such changes.

Probably an easier solution is to always keep a trailing comma for the last output line.

Screenshots

No response

Exception traceback

How do you run Weblate?

Other

Weblate versions

5.12.2 (Codeberg Translate)

Weblate deploy checks

Additional context

No response

[nijel]

In most cases such merge requests happen because of using different merge strategy in Weblate and when merging changes from Weblate. Having rebase and merge on both sides often helps.

[pastk]

Hmm, we use rebase strategy everywhere...

Also I must say that yesterday I saw the same pattern of a new string being added to the end of the json file and there was no merge conflict. So its not the actual cause.

[pastk]

Still, it might be a bit cleaner and less diff noise if there was a trailing comma everywhere?

Though I've checked that at the moment Weblate can't even parse such files with a trailing comma - produces a parse error.

[nijel]

There can't be a trailing comma on the last element; that's not valid in JSON.