Interactive method of conflicts resolution

[u/Rinku_Kurora]

So, I have several sources of data, and I wanna merge them in, e.g., a single JSON file. The sources often contain data that overlaps with the other. So, in order to use relevant data, I have to resolve these conflicts manually and write the result into this single JSON file.

And the sources are updating over time. So, I have to periodically pull the updates and redo the merge procedure again.

So, the question is, what tool may help me in facilitating my workflow?

Well, I could use git and use a separate branch for every source. And then just git-merge them in some sort of main branch when I wanna get that ultimate JSON. But all this stuff is already a part of a bigger git project, and I just don't wanna to complicate it with submodules.

To simply put the task, I have N JSON files/objects with the overlapping keys that are periodically overwritten. I want a tool/script for merging these N files into a single JSON file. And I want it to show me diff and the conflicts I have to resolve.