Closed cromlyngames closed 4 years ago
When you're making the edits, remember to pull from my upstream branch as well so that you can resolve the conflicts.
https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/syncing-a-fork
I've replied to some comments, actioned others.
Cant figure out how to pull your current into mine with a pull request going the other way still active.
On Wed, Jul 8, 2020 at 10:58 AM Dave Parr notifications@github.com wrote:
When you're making the edits, remember to pull from my upstream branch as well so that you can resolve the conflicts.
https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/syncing-a-fork
— You are receiving this because you authored the thread. Reply to this email directly, view it on GitHub https://github.com/DaveParr/awesome-climate-data/pull/1#issuecomment-655419492, or unsubscribe https://github.com/notifications/unsubscribe-auth/AEMIN2RKIYU3CXTGYBD4H73R2Q7L5ANCNFSM4OTP77JA .
Thanks buddy, a lot of good stuff in here, but I think wee need to organise it a bit better before we merge it.
~Also, You've deleted the IPCC :P~ Sorry, you didn't i did by updating underneath you. My bad.
See in line for requested changes I'll be putting up over the next few minutes
Commiting changes to your
main
and then pushing will update this pr, so no need to make a new one.