existing lesson updates

[lwasser]

hey @jsta just checkin in on these... a while back a group of us starting working on a redo of these lessons including adding the new DC template ..

https://github.com/lwasser/r-spatial-data-management-intro/tree/gh-pages/_episodes_rmd

i see there is some work on this... i haven't integrated back but also havent had time this semester. what is the best way to proceed to incorporate other edits? a PR may cause conflicts but i'm not sure how much has been done at this point. or what is being done. i'm psyched to see some contributions however.

[jsta]

I see that people are filing issues to this repo as part of the instructor checkout process so I wanted to clean it up for them. The DC template in your fork should make this easier.

Most of the recent commits deal with getting the lessons to build (and documenting the build process in the README). The DC template solves most of this so I don't see a problem in rolling them back to merge the your fork.

I wouldn't want to lose any contributor material (I think its just https://github.com/datacarpentry/r-spatial-data-management-intro/pull/36) but maybe this info doesn't have a corresponding home in your fork?

[lwasser]

oh cool! i see. sounds good. We had talked about reorganizing the lessons... i just noticed they still only have my author name on them from when i was working on my course... it's need to be updated! what is a good way to merge things without undoing anyone's work? i essentially restructured the lessons to make them a bit cleaner

[lwasser]

so for instance the spatial data landscape is now just spatial intro ... so we made some structural changes. which i'm very open to feedback on i just don't want to lose the work !

[lwasser]

btw super psyched to see @tyson-swetnam contributing to these!! :) we need help and appreciate your expertise on the lessons!!

[jsta]

Could you roll back this repo to e703b068a31557f041945099bb043f4823b357d4 when it looks like they were in sync. Then initiate a PR from your fork to this repo?

[jsta]

We would lose Tyson's PR, my misc jekyll build edits, which the DC template fixes, and some license and URL fixes, which I assume is also fixed by the DC template.

[lwasser]

roll back the gh-pages branch? i could try to roll back on a branch perhaps to avoid losing @tyson-swetnam edits? btw we should probably move to master, at some point too ?

[lwasser]

or i could try to merge on a branch first and then see what it looks like with tyson's pr ?

[lwasser]

ok ! you know if the only edit is from @tyson-swetnam i could just copy that over! i suggest it goes in the intro lesson... how does that sound? then we can merge. we were working on applying the template . does that sound ok @jsta @tyson-swetnam

[jsta]

Sure. Also, I think we are fine without a master branch. Few of the other DC lessons have them.

[lwasser]

sure... i was thinking just deleting gh-pages and defaulting to master but if DC is still all gh-pages then sure!

[lwasser]

Ok so i'll merge in Tyson's changes and will push the PR to gh-pages from the dev branch i just built!

[lwasser]

to dos:

• [ ] merge edits here with the spatial intro lessons

https://github.com/datacarpentry/r-spatial-data-management-intro/pull/36

[lwasser]

ok i can't do this now as i literally have to pack BUT i'll keep this on my list of to do's and will push back a clean set of lessons . then maybe we can get some folks on board to help rebuild these lessons!!!

[tyson-swetnam]

I'm at AGU for the rest of this week - will try and circle back before the holidays. Looking forward to sprucing these tutorials up!

On Mon, Dec 11, 2017 at 4:39 PM, Leah Wasser notifications@github.com wrote:

ok i can't do this now as i literally have to pack BUT i'll keep this on my list of to do's and will push back a clean set of lessons . then maybe we can get some folks on board to help rebuild these lessons!!!

— You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub https://github.com/datacarpentry/r-spatial-data-management-intro/issues/40#issuecomment-350882196, or mute the thread https://github.com/notifications/unsubscribe-auth/AK_jgfgM-bA_Hd7NDQZSNMMdpT_q48_9ks5s_a8ygaJpZM4Q-FUs .

--

Tyson L. Swetnam Scientific Analyst, CyVerse University of Arizona www.cyverse.org Email: tswetnam@cyverse.org XXX@cyverse.org Office Phone: +1 (520) 621-4013