search

openclimatedata / unfccc-detailed-data-by-party

UNFCCC Emissions data from the Detailed Data By Party interface
7 stars 4 forks source link

Conflicts in archive directory #8

Open JGuetschow opened 5 years ago

JGuetschow commented 5 years ago

I noticed that trying to merge two revisions with data downloads git fails and leaves a mess that I think has to be cleaned by hand which is impossible for 20.000+ files in the archive. So I had to use a fresh clone of the repository. So whenever downloading the data make sure that your working copy is up to date and commit right after that, else you'll end up with a mess.

rgieseke commented 5 years ago

Do you think the make clean step should be made clearer in the Readme?

We could also add a check in the download script to check for a "clean" state of the repo.

JGuetschow commented 5 years ago

I don't know if that would have helped in my case, because I had a clean repo, and downloaded data locally and committed. In parallel you downloaded and committed. The necessary merging failed because there were too many changed files. So my mistake was to not either push or pull in the right time. I don't know if removing all the downloaded files after they've been committed would help, but maybe with missing files the resolving would default to "accept theirs".