search

GlobalHydrologyLab / AquaSat

Monitoring water quality from space!
MIT License
47 stars 16 forks source link

Towards Rmd Remaking #9

Closed matthewross07 closed 6 years ago

matthewross07 commented 6 years ago

Alison, I'm not sure why I am getting a "Can't automatically merge" warning when I create this pull request, but I tried to fix all of the things we discussed and I'm going to draw out the network of steps now.

aappling-usgs commented 6 years ago

@matthewross07 , looks like the offending file is related to a rename+edit that you did, 2_rsdata/src/1_FlatSiteInventory.Rmd → 2_rsdata/src/1_Landsat_Site_Inventory.Rmd. What happens if you rename that file back to 1_FlatSiteInventory.Rmd for now and push that as another commit - will git allow the merge then?