2023 weather data updates

[Janewyx]

• Removed duplicate files from data/ directory (already updated the R/shiny/data folder
• Keeping intermediate files necessary for each year's update in data folder
• Tested all functionalities - did not experience bugs on windrose

[Janewyx]

Please accept incoming changes with the data updates in R/shiny/data/ folder

[bevingtona]

Hmm, lot's of data conflicts when I pull this :

R/shiny/data/NBCClimateStns_VF.xlsx
R/shiny/data/annual_sum.csv
R/shiny/data/gseason_sum.csv
R/shiny/data/month_year_sum.csv
R/shiny/data/monthly_sum.csv
R/shiny/data/real_time_stn.csv
R/shiny/data/seasonal_sum.csv
R/shiny/data/wind_df.csv
R/shiny/data/wxstn_df.csv
R/shiny/data/wxstn_sites.csv

$ git pull https://github.com/Janewyx/nbcclim.git master
remote: Enumerating objects: 70, done.
remote: Counting objects: 100% (70/70), done.
remote: Compressing objects: 100% (53/53), done.
remote: Total 59 (delta 27), reused 24 (delta 6), pack-reused 0
Unpacking objects: 100% (59/59), 11.25 MiB | 2.35 MiB/s, done.
From https://github.com/Janewyx/nbcclim

• branch master -> FETCH_HEAD
  warning: Cannot merge binary files: R/shiny/data/NBCClimateStns_VF.xlsx (HEAD vs. 37a6b9b)
  Auto-merging R/shiny/data/NBCClimateStns_VF.xlsx
  CONFLICT (add/add): Merge conflict in R/shiny/data/NBCClimateStns_VF.xlsx
  Auto-merging R/shiny/data/annual_sum.csv
  CONFLICT (add/add): Merge conflict in R/shiny/data/annual_sum.csv
  Auto-merging R/shiny/data/gseason_sum.csv
  CONFLICT (add/add): Merge conflict in R/shiny/data/gseason_sum.csv
  Auto-merging R/shiny/data/month_year_sum.csv
  CONFLICT (add/add): Merge conflict in R/shiny/data/month_year_sum.csv
  Auto-merging R/shiny/data/monthly_sum.csv
  CONFLICT (add/add): Merge conflict in R/shiny/data/monthly_sum.csv
  Auto-merging R/shiny/data/real_time_stn.csv
  CONFLICT (add/add): Merge conflict in R/shiny/data/real_time_stn.csv
  Auto-merging R/shiny/data/seasonal_sum.csv
  CONFLICT (add/add): Merge conflict in R/shiny/data/seasonal_sum.csv
  Auto-merging R/shiny/data/wind_df.csv
  CONFLICT (add/add): Merge conflict in R/shiny/data/wind_df.csv
  Auto-merging R/shiny/data/wxstn_df.csv
  CONFLICT (add/add): Merge conflict in R/shiny/data/wxstn_df.csv
  Auto-merging R/shiny/data/wxstn_sites.csv
  CONFLICT (add/add): Merge conflict in R/shiny/data/wxstn_sites.csv
  Auto-merging R/shiny/global.R
  Automatic merge failed; fix co

[Janewyx]

Good morning Alex,Thank you for taking a look at my PR -Would you like me to schedule a teams meeting with you, and we could to go over the conflict? I have not handled the csv conflicts before and wonder what the best path forward is..If you have some time, could you let me know your availability this week, please? Thanks!Jane On Mar 27, 2023, at 8:44 AM, Alexandre Bevington ***@***.***> wrote: Reopened #22. —Reply to this email directly, view it on GitHub, or unsubscribe.You are receiving this because you authored the thread.Message ID: ***@***.***>

[bevingtona]

We manually removed the files from the app and replaced with the PR code