NEFSC / NEFSC-Spatial

http://nefsc.github.io/NEFSC-Spatial
http://nefsc.github.io/NEFSC-Spatial
Other
7 stars 0 forks source link

Getting started #38

Closed andybeet closed 1 year ago

andybeet commented 1 year ago

You'll need to switch to this branch then pkgdown::build_site() locally to see changes

jmhatch commented 1 year ago

It appears that GitHub is using the version of main when the PR was created to do PR comparisons, and not the updated version of main after PR #37. I guess it's a known issue (see here). This can (will) cause problems, as this PR (#38) will delete updates made in PR #37 (but you wouldn't know that from the PR comparison below). From the linked discussion, you can force the comparison. Just noting this for future reference.

andybeet commented 1 year ago

how did you discover this?. maybe i should pull main into this branch?

jmhatch commented 1 year ago

I noticed it because I had just merged your PR #37, so I was aware of the updates you made. But when I was reviewing PR #38, I noticed that those updates weren't there (maybe b/c you updated PR #37 after initiating PR #38?). Because of those diffs I was expecting some conflicts or something (but GH was saying everything was good to go). So I did some Googling and stumbled on that discussion. I'm not sure what the best was is to resolve this, and I'm also not entirely sure what will happen is this PR gets merged with main. I'm assuming the updates in PR #37 will get deleted?

andybeet commented 1 year ago

ok. i am going to merge main into this branch and see if that resolves the problem. See if you see the same issue now. I think it might be ok

jmhatch commented 1 year ago

Nice solution, @andybeet! Merging main into this branch did the trick. I'll try to take a look at the added articles sometime today (or later this week).

jmhatch commented 1 year ago

Looks great, Andy! I made some very small changes:

andybeet commented 1 year ago

@jmhatch Like all changes. Thanks. Feel free to merge!