search

depthfirstlearning / depthfirstlearning.com

Other
196 stars 29 forks source link

[WGAN] Added a missing required reading and fixed a link #32

Closed JamesAllingham closed 4 years ago

JamesAllingham commented 4 years ago

Whoops, I'm not sure how this ended up being missed! Or why I only caught it now... but anyways, here is a fix.

cinjon commented 4 years ago

nice! however, can't rebase this in because there are conflicts. mind fixing this?

JamesAllingham commented 4 years ago

nice! however, can't rebase this in because there are conflicts. mind fixing this?

Happy to... but slightly confused :P Where are the conflicts? GitHub has the big green banner telling me that there are no conflicts with the base branch, and I've been able to merge this branch into master locally.

cinjon commented 4 years ago
Screen Shot 2019-10-03 at 8 55 09 AM
cinjon commented 4 years ago

... awkward. lol. hmm.

JamesAllingham commented 4 years ago

awkward

JamesAllingham commented 4 years ago

Awkward indeed :P

cinjon commented 4 years ago

what happens if you do a completely clean branch and then just add these two changes on top?

JamesAllingham commented 4 years ago

I'll try that...

JamesAllingham commented 4 years ago

So that also seems to work. Should I open a PR for that and we can see if it looks good on your side?

cinjon commented 4 years ago

Yup, let's do that.

On Thu, Oct 3, 2019 at 9:03 AM James Allingham notifications@github.com wrote:

So also seems to work, should I open a PR for that and we can see if it looks good on your side?

— You are receiving this because you commented. Reply to this email directly, view it on GitHub https://github.com/depthfirstlearning/depthfirstlearning.com/pull/32?email_source=notifications&email_token=AAEWHN7OJ5IC22ZZCZ4ML73QMXUT7A5CNFSM4I5CP4O2YY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOEAIEB3I#issuecomment-537936109, or mute the thread https://github.com/notifications/unsubscribe-auth/AAEWHN3SSKQYJFSHUJ5HQJTQMXUT7ANCNFSM4I5CP4OQ .