search

CodeForPittsburgh / food-access-map-data

Data for the food access map
MIT License
8 stars 18 forks source link

2022 05 10 add merge logging #207

Closed maxachis closed 2 years ago

melynnduh commented 2 years ago

i'm seeing that "testthat" keeps failing and I can't approve this PR because of that

maxachis commented 2 years ago

@melynnduh Noted! Testthat was failing because I hadn't merged a fix to the R tests that was already in Master into this branch. I just did that, so this branch should be good to go now!

hellonewman commented 2 years ago

@maxachis this branch has conflicts: .github/workflows/generate_merged_dataset.yml food-data/new-datasets/wicresults.json food-data/processed-datasets/merged_datasets.csv

maxachis commented 2 years ago

@maxachis this branch has conflicts: .github/workflows/generate_merged_dataset.yml food-data/new-datasets/wicresults.json food-data/processed-datasets/merged_datasets.csv

Merge committed! I accepted the master's version of all files, as none of them were impacted by my change.