search

RhoBott / data_at_reed

A repository to manage the D@R update!
2 stars 0 forks source link

Rainy tuesday #26

Closed zolli22 closed 3 years ago

zolli22 commented 3 years ago

made a few small changes to loading and wrangling data, and created a "more resources" page

zolli22 commented 3 years ago

sigh... there seems to be an issue... me and git just do not get along very well :-/

shokatl commented 3 years ago

sigh... there seems to be an issue... me and git just do not get along very well :-/

I don't think this will be a big problem! My guess is that git doesn't like new docs being added from branches? But merge conflicts (from what I've heard, not from experience haha) are usually not too hard to overcome... But I say that right after messaging Simon to ask for help :)

I'm going to make additional commits to the non-conflicting document in the meantime

shokatl commented 3 years ago

sigh... there seems to be an issue... me and git just do not get along very well :-/

I don't think this will be a big problem! My guess is that git doesn't like new docs being added from branches? But merge conflicts (from what I've heard, not from experience haha) are usually not too hard to overcome... But I say that right after messaging Simon to ask for help :)

I'm going to make additional commits to the non-conflicting document in the meantime

Oh actually seems to be something else. Looking at it now