covid19 icon indicating copy to clipboard operation
covid19 copied to clipboard

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

Open esteblock opened this issue 4 years ago • 1 comments

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

esteblock avatar Apr 11 '20 15:04 esteblock

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.

stevenliuyi avatar Apr 12 '20 21:04 stevenliuyi