diff --git a/.gitattributes b/.gitattributes index 743a134c41a..9d0957c7459 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,10 +1,10 @@ # Collapsing generated schemas from PR diff by default /ansible_collections/arista/avd/roles/eos_cli_config_gen/schemas/eos_cli_config_gen.schema.yml linguist-generated=true -merge -diff /ansible_collections/arista/avd/roles/eos_cli_config_gen/schemas/eos_cli_config_gen.jsonschema.json linguist-generated=true -merge -diff -/ansible_collections/arista/avd/roles/eos_cli_config_gen/schemas/eos_cli_config_gen.schema.pickle linguist-generated=true -merge -diff +/ansible_collections/arista/avd/roles/eos_cli_config_gen/schemas/eos_cli_config_gen.schema.pickle linguist-generated=true merge=union -diff -text /ansible_collections/arista/avd/roles/eos_designs/schemas/eos_designs.schema.yml linguist-generated=true -merge -diff /ansible_collections/arista/avd/roles/eos_designs/schemas/eos_designs.jsonschema.json linguist-generated=true -merge -diff -/ansible_collections/arista/avd/roles/eos_designs/schemas/eos_designs.schema.pickle linguist-generated=true -merge -diff +/ansible_collections/arista/avd/roles/eos_designs/schemas/eos_designs.schema.pickle linguist-generated=true merge=union -diff -text # Collapsing generated tables from PR diff by default /ansible_collections/arista/avd/roles/eos_cli_config_gen/tables/* linguist-generated=true -merge -diff