search

stevenliuyi / covid19

an interactive, animated COVID-19 coronavirus map to track the outbreak over time by country and by region for selected countries
MIT License
325 stars 97 forks source link

Adding to .gitignore public/data/all_minified.json and public/data/all.json #29

Open esteblock opened 4 years ago

esteblock commented 4 years ago

Hi! I have been trying to merge my clone with this repository, and I always got problems merging these files.

public/data/all_minified.json public/data/all.json

In fact, all files that are being modified during the installation process. Won't be better to add all those files or folders to .gitignore?

Esteban

stevenliuyi commented 4 years ago

Hi! Actually that's what I thought at first. But it seems that some people have been facing various issues during the installation process. In case they are not able to finish the whole process, they can still build the site using the included data files.

Regarding the merge issue, I've been using -X theirs or -X ours to automatically resolve the conflicts.