Git -Filialespezifische Dateien
git config --global merge.ours.driver true
Evil Earthworm
git config --global merge.ours.driver true
echo 'email.json merge=ours' >> .gitattributesgit add .gitattributesgit commit -m 'chore: Preserve email.json during merges'
mkdir tmpcd tmpgit initgit commit --allow-empty -m "chore: Initial commit"