We have 2 to 3 developers who have forked the main branch and are working on custom functionality. Each would be creating custom fields and custom doctype. When they try to merge the code using git, the custom_field.json is having merge conflict and git is not automatically able to merge.
Also we find it difficult to manually merge it as the JSON file is large and prone to manual error.
Is there a standard way to merge Custom Field changes made by multiple developer?