echo 'email.json merge=ours' >> .gitattributesgit add .gitattributesgit commit -m 'chore: Preserve email.json during merges'