search

PCCMathSAC / apex-mbx

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

Indenting and text numbers to math #25

Closed CVollet closed 8 years ago

CVollet commented 8 years ago

I'm not sure if I followed your indenting exactly, but I tried. I didn't touch any tables or figures. Also removed extra whitespace in paragraphs. Should I also be doing the same thing with <me>?

Alex-Jordan commented 8 years ago

There are some issues here. Don't try to fix them; I just need some time to think about an easy way to handle it.

1.) You committed a swap (.swp) file. A swap file is a temporary file that is created while you are editing something. Here, you maybe opened sec_limit_intro.mbx with vim, and sec_limit_intro.mbx.swp was created. It would go away once you closed vim. Before you used git add, you want to use git status and it would have shown you that this swap file was a new thing. At that point, you could either close the editing software, or only git add what you want to stage. So like git add sec_limit_intro.mbx instead of git add --all.

2.) The pull request says there are conflicts. It would have been telling you this before you confirmed the pull request, and that should be a signal that you had not fetched and pulled prior to doing your work. Or maybe you did, but a few days passed in the meantime where my own pull requests had been approved. If it was this latter thing, then what you do is git fetch, then git checkout master and git pull to get your local master up to date. Then go back to dev (git checkout dev) and rebase with git rebase master. You would have to make your commits on dev first. Doing all this prior to pushing to GitHub is best practice and will avoid conflicts.

I'm sure your indentation is fine. Before we move past this section, I will research auto-indenting with a lint program. <me> should appear inside <p>, and inside the <p> you should be "tight" with spacing. Inside the <me> is all content that will be processed by LaTeX/MathJax one way or the other. I personally would be tight on spacing there too, but I am less sure that it makes a difference.

CVollet commented 8 years ago

I wasn't sure what the .swp file was. Now I know.

I think the issue was your unapproved pull request.

On Aug 18, 2016 5:49 PM, "Alex Jordan" notifications@github.com wrote:

There are some issues here. Don't try to fix them; I just need some time to think about an easy way to handle it.

1.) You committed a swap (.swp) file. A swap file is a temporary file that is created while you are editing something. Here, you maybe opened sec_limit_intro.mbx with vim, and sec_limit_intro.mbx.swp was created. It would go away once you closed vim. Before you used git add, you want to use git status and it would have shown you that this swap file was a new thing. At that point, you could either close the editing software, or only git add what you want to stage. So like git add sec_limit_intro.mbx instead of git add --all.

2.) The pull request says there are conflicts. It would have been telling you this before you confirmed the pull request, and that should be a signal that you had not fetched and pulled prior to doing your work. Or maybe you did, but a few days passed in the meantime where my own pull requests had been approved. If it was this latter thing, then what you do is git fetch, then git checkout master and git pull to get your local master up to date. Then go back to dev (git checkout dev) and rebase with git rebase master. You would have to make your commits on dev first. Doing all this prior to pushing to GitHub is best practice and will avoid conflicts.

I'm sure your indentation is fine. Before we move past this section, I will research auto-indenting with a lint program. should appear inside

, and inside the

you should be "tight" with spacing. Inside the is all content that will be processed by LaTeX/MathJax one way or the other. I personally would be tight on spacing there too, but I am less sure that it makes a difference.

— 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/25#issuecomment-240899165, or mute the thread https://github.com/notifications/unsubscribe-auth/AGBt61ngtO3W27QqLvAfb9rtqkNEiix2ks5qhP2qgaJpZM4JnwWd .

Alex-Jordan commented 8 years ago

I addressed the merge conflicts and removed the swap file locally, then committed (with CVollet attributed), and pushed directly. Also just posted freshly generated content to http://spot.pcc.edu/math/APEXCalculus/sec_limit_intro.html.

So, closing this PR. I'll email you separately with instructions for fixing your git branches locally.