search

taradinoc / mdl-docs

The MDL Programming Language by S. W. Galley and Greg Pfister
26 stars 8 forks source link

Add chapter 23. #27

Closed OrangeToucan closed 7 years ago

OrangeToucan commented 7 years ago

I have made these changes.

OrangeToucan commented 7 years ago

Also updating mkdocs.yml may be reaching the limits of my git knowledge, because at the time that the branch was created chapter 22 was not in there yet which meant I couldn't add chapter 23 and now I don't know how to do that.

OrangeToucan commented 7 years ago

Supposedly I tried pulling in your addition of chapter 22 into my fork with a pull request so that I could rebase my chapter-23 branch on the updated master but now these changes seem to be mentioned in this pull request, and my chapter-23 branch still does not seem updated, even though I did did rebase master, made changes, and did git commit --amend followed by git push --force origin chapter-23.

I suppose I should have only tried to merge the chapters one at a time. Now everything seems to be falling all over itself.

OrangeToucan commented 7 years ago

After more git head banging I'm going to close these pull requests, delete everything, and start over. Very much a case of https://xkcd.com/1597/ (mkdocs.yml could have been updated later.)