GitLab

Created by: fernao

Create a git hook for running in cases of conflicts between two or more json files.

Must:

• split the conficted version in N objects
• interpret json object as json
• merge objects according to rules defined by a specific logic

This logic may be, for example:

• priority: owner / first publisher of content
• date
• etc

Created by: fernao

This was intended for making comparisons between jsons with tag metadata. As tags now are with the files inside of git-annex logic, this is no longer necessary.