Closed mitchkeller closed 5 years ago
Works perfectly. Thanks Mitch! MB
On Tue, Dec 18, 2018 at 3:38 PM Mitchel T. Keller notifications@github.com wrote:
I'll leave this for @mattboelkins https://github.com/mattboelkins to merge, but it should all be working.
Before doing git pull upstream master on your machine, make a copy of Makefile.paths somewhere else on your hard drive, as this update may delete the file. You can then just copy back the backup copy you made and go about your business. (I shouldn't have had you do a git add on Makefile.paths, since that's a file that each person should have their own copy of. It is now set up in the .gitignore file, so shouldn't be a problem in future.)
You can view, comment on, or merge this pull request online at:
https://github.com/active-calculus/prep/pull/1 Commit Summary
- Add .gitignore
- Stop tracking Makefile.paths
- Update Makefile and Makefile.paths.original
- Convert custom XSLT from ACS to APC
- Activities Workbook and Solution Manual
File Changes
- A .gitignore https://github.com/active-calculus/prep/pull/1/files#diff-0 (15)
- M Makefile https://github.com/active-calculus/prep/pull/1/files#diff-1 (29)
- D Makefile.paths https://github.com/active-calculus/prep/pull/1/files#diff-2 (47)
- M Makefile.paths.original https://github.com/active-calculus/prep/pull/1/files#diff-3 (6)
- A src/apc-activity-workbook.xml https://github.com/active-calculus/prep/pull/1/files#diff-4 (51)
- A src/apc-solution-manual.xml https://github.com/active-calculus/prep/pull/1/files#diff-5 (88)
- A xsl/apc-activity-workbook.xsl https://github.com/active-calculus/prep/pull/1/files#diff-6 (128)
- A xsl/apc-common.xsl https://github.com/active-calculus/prep/pull/1/files#diff-7 (167)
- M xsl/apc-latex.xsl https://github.com/active-calculus/prep/pull/1/files#diff-8 (140)
- A xsl/apc-solution-manual.xsl https://github.com/active-calculus/prep/pull/1/files#diff-9 (175)
Patch Links:
- https://github.com/active-calculus/prep/pull/1.patch
- https://github.com/active-calculus/prep/pull/1.diff
— You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub https://github.com/active-calculus/prep/pull/1, or mute the thread https://github.com/notifications/unsubscribe-auth/ANQ4JUUgEwfRlpw-n99tGYO1gmUuL3ubks5u6VIzgaJpZM4ZZCdt .
I'll leave this for @mattboelkins to merge, but it should all be working.
Before doing
git pull upstream master
on your machine, make a copy ofMakefile.paths
somewhere else on your hard drive, as this update may delete the file. You can then just copy back the backup copy you made and go about your business. (I shouldn't have had you do agit add
onMakefile.paths
, since that's a file that each person should have their own copy of. It is now set up in the.gitignore
file, so shouldn't be a problem in future.)