search

PCCMathSAC / apex-mbx

Repository for a conversion of APEX Calculus to MathBook XML
2 stars 10 forks source link

Manual Edits on Limits w/infinity #60

Closed CVollet closed 7 years ago

CVollet commented 7 years ago

I commented out parts of the language that I wanted to change in case there were disagreements (easier to revert back to the original that way). If everything looks good, I'll go back and delete the parts I commented out.

Alex-Jordan commented 7 years ago

All your changes are good for me. And if Greg is not following this, I don't think they are controversial enough to bother him.

If you want to try a git exercise, then rather than doing one more commit to remove the comments, you could:

  1. close this pull request, unmerged
  2. git reset HEAD~ will undo your last commit. The edits you made will still be there, but they will be staged (added) and not yet committed. You can (should) verify by using git status and perhaps opening this file to see.
  3. make edits to remove the commentary
  4. edit your new example title from "dominating terms" to <q>dominating terms</q>
  5. use git add and git commit to make a new commit with all the work from both sessions.
  6. visit the CVollet GitHub repo, go into branches, and delete the dev branch there, because it has the commit that has the comments still in it.
  7. git push upstream dev to push your work onto GitHub, where a new dev branch will be created. Then make a new pull request.
CVollet commented 7 years ago

Can you take a look at this one Alex? It's been hanging out for awhile. I'm afraid the diff file is getting rather large.

CVollet commented 7 years ago

You are absolutely right. I thought I had changed it to Table at some point. I"ll fix that in the next commit.

On Wed, Oct 12, 2016 at 9:13 AM, Alex Jordan notifications@github.com wrote:

Merged #60 https://github.com/PCCMathSAC/apex-mbx/pull/60.

— You are receiving this because you authored the thread. Reply to this email directly, view it on GitHub https://github.com/PCCMathSAC/apex-mbx/pull/60#event-821221311, or mute the thread https://github.com/notifications/unsubscribe-auth/AGBt6-0yKJRronFpzZcZyB2X41HnxNECks5qzQc-gaJpZM4KQrY1 .

Carly Vollet Mathematics Instructor Math Department Co-Chair Math Club Faculty Advisor PCC Cascade, SSB 321 971-722-5564